summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Enable obfs4proxy debug logging.feature/8243-meekanonym2020-05-201-1/+1
* Merge remote-tracking branch 'origin/stable' into feature/8243-meekanonym2020-05-202253-108537/+55666
|\
| * Merge remote-tracking branch 'origin/bugfix/17278-fix-additional-software-int...anonym2020-05-199-29/+93
| |\
| | * Lintintrigeri2020-05-141-3/+5
| | * Refactor tails-upgrade-frontend-wrapper: avoid double-negationintrigeri2020-05-141-3/+3
| | * Remove dead codeintrigeri2020-05-141-3/+0
| | * Test suite: adjust for increased TimeoutStopsec= (refs: #17278)intrigeri2020-05-141-1/+4
| | * Test suite: only save extra debugging artifacts if we're in the Additional So...intrigeri2020-05-141-14/+17
| | * Give tails-remove-overlayfs-dirs.service more time to do its job (refs: #17278)intrigeri2020-05-141-0/+7
| | * Give tails-synchronize-data-to-new-persistent-volume-on-shutdown.service more...intrigeri2020-05-141-0/+9
| | * sync(1) the persistent volume after copying APT data to it (refs: #17278)intrigeri2020-05-141-1/+2
| | * Test suite: save a bunch more debugging data on failure (refs: #17278)intrigeri2020-05-141-0/+14
| | * Create flag file for debugging (refs: #17278)intrigeri2020-05-141-1/+3
| | * Test suite: restore Journal artifact extensionintrigeri2020-05-131-2/+3
| | * Test suite: give variable a name closer to its usageintrigeri2020-05-131-11/+11
| | * Test suite: add helper functionintrigeri2020-05-131-0/+7
| | * Test suite refactoring: extract code to generic functionsintrigeri2020-05-131-8/+25
| | * Disable periodic APT operations (refs: #17278)intrigeri2020-05-133-4/+5
| | * Fix typo in commentintrigeri2020-05-131-1/+1
| | * Additional Software: preserve file ownership when saving a copy of APT listsintrigeri2020-05-121-1/+1
| * | Merge branch 'bugfix/17706-outdated-torrc' into stable (Closes: #17706)intrigeri2020-05-151-143/+0
| |\ \
| | * | torrc: remove antiquated, commented-out default configuration (refs: #17706)intrigeri2020-05-151-128/+0
| | * | Remove header that doesn't make sense to our users (#17706)sajolida2020-05-151-15/+0
| | |/
| * | Merge remote-tracking branch 'origin/feature/17621-keep-latest-screenshot' in...intrigeri2020-05-151-2/+0
| |\ \ | | |/ | |/|
| | * Keep latest test suite screenshot (refs: #17621)segfault2020-04-151-2/+0
| * | Merge remote-tracking branch 'origin/bugfix/17668-fix-unlock-veracrypt-volume...intrigeri2020-05-101-1/+2
| |\ \
| | * | Fix title of unlock-veracrypt-volume error dialog in case of incorrect passwo...segfault2020-05-021-1/+2
| * | | Merge branch 'bugfix/15146-overlayfs-memory-erasure+force-all-tests' into sta...intrigeri2020-05-104-12/+25
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/stable' into bugfix/15146-overlayfs-memo...intrigeri2020-05-102245-108354/+55604
| | |\ \ \
| | * | | | Use util-linux' mount/umount in initramfs used during shutdown.anonym2020-04-201-0/+6
| | * | | | Test suite: speed up 'I fill a .. MiB file' step by 1000%.anonym2020-04-191-3/+6
| | * | | | Merge remote-tracking branch 'origin/stable' into bugfix/15146-overlayfs-memo...anonym2020-04-161703-23117/+61720
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/testing' into bugfix/15146-overlayfs-mem...intrigeri2020-04-04542-23606/+45483
| | |\ \ \ \ \
| | * | | | | | Fix base branchintrigeri2020-04-041-1/+1
| | * | | | | | Ensure real mount/umount is used instead of busybox'ssegfault2020-04-032-9/+10
| | * | | | | | Ensure that no lazy unmounts are ongoing before moving mountpointssegfault2020-04-031-0/+3
| * | | | | | | Merge remote-tracking branch 'origin/bugfix/17623-allow-connecting-via-virt-v...intrigeri2020-05-101-1/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Fix test suite breaking when the user connects to the VM via virt-viewer (ref...segfault2020-04-261-1/+4
| * | | | | | | | Merge branch 'feature/17677-make-iuk-source-versions-sort-version-numbers' in...intrigeri2020-05-101-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Use long option nameintrigeri2020-05-101-1/+1
| | * | | | | | | iuk-source-versions: output sorted version numbersCyril Brulebois2020-05-051-2/+2
| * | | | | | | | Add dummy changelog entry for 4.7.Cyril Brulebois2020-05-061-0/+6
| * | | | | | | | Merge branch 'origin/master' into stableCyril Brulebois2020-05-06137-765/+8789
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make lint_po happysajolida2020-05-0610-13/+43
| | * | | | | | | | merge with main git using merge_canonical_changes.py.Tails translators2020-05-0532-147/+299
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | updated PO filesIkiWiki2020-05-056-6/+88
| | | * | | | | | | | Merge branch 'master' of puppet-git.lizard:tailsIkiWiki2020-05-052-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master'sajolida2020-05-05121-4458/+9704
| | | | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | | * | | | | | | | Reduce logo to 100 px in heightsajolida2020-05-051-0/+0
| | | | * | | | | | | | Merge remote-tracking branch 'moire/web/partner-17669'sajolida2020-05-052-0/+1
| | | | |\ \ \ \ \ \ \ \