summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterfeature/tor-nightly-masterintrigeri12 days13-9/+35
|\
| * Merge branch 'stable' into develanonym2019-06-116-2/+18
| |\
| | * Merge remote-tracking branch 'origin/feature/16687-tor-0.4.0.x+force-all-test...anonym2019-06-113-1/+6
| | |\
| | | * Install tor 0.4.0.x from tor-experimental-0.4.0.x-stretch (refs: #16687)intrigeri2019-06-083-1/+6
| | * | Merge remote-tracking branch 'origin/feature/12003-custom-home-for-rc+force-a...anonym2019-06-113-0/+9
| | |\ \
| | | * \ Merge branch 'stable' into feature/12003-custom-home-for-rc+force-all-testsintrigeri2019-05-298-138/+88
| | | |\ \
| | | * | | Set Tor Browser's homepage to https://tails.boum.org/home/testing/ if buildin...intrigeri2019-05-243-0/+9
| | * | | | Merge remote-tracking branch 'origin/test/16793-save-all-tor-logs' into stableanonym2019-06-111-2/+4
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Test suite: Don't flood the debug logger with tor@default's journal contents.intrigeri2019-06-091-1/+2
| | | * | | Test suite: fix indentation.intrigeri2019-06-091-1/+1
| | | * | | Test suite: simplify.intrigeri2019-06-091-1/+1
| | | * | | Test suite: also include the content of /var/log/tor/log in $scenario.tor whe...intrigeri2019-06-091-0/+1
| | |/ / /
| * | | | Merge branch 'stable' into develanonym2019-06-068-5/+20
| |\ \ \ \ | | |/ / /
| | * | | Fix FTBFS by pinning the GID of the new Debian-exim group.anonym2019-06-063-2/+6
| | * | | Merge branch 'feature/16148-unfiltered-pcaps' into stableanonym2019-06-063-3/+9
| | |\ \ \
| | | * | | Don't filter during pcap capture.anonym2019-06-042-2/+8
| | | * | | Fix outdated comment.anonym2019-06-041-1/+1
| | * | | | Merge branch 'feature/16148-disable-ipv6' into stableanonym2019-06-061-0/+5
| | |\ \ \ \
| | | * | | | Enable IPv6 for the loopback interface.anonym2019-06-061-0/+3
| | | * | | | Completely disable IPv6.anonym2019-06-041-0/+2
| | | |/ / /
| | * | | | Merge remote-tracking branch 'origin/bugfix/16742-thunderbird-60.7.0+force-al...anonym2019-06-051-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Rename APT overlay to match new branch name.intrigeri2019-06-031-0/+0
| | | * | | Enable the bugfix-16742-thunderbird-60.7.0 APT overlay (refs: #16742).segfault2019-06-011-0/+0
| | | | |/ | | | |/|
| * | | | Merge branch 'stable' into develintrigeri2019-06-021-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'bugfix/16731-explicit-partprobe' into stable (Fix-committed: #1...segfault2019-06-021-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'stable' into bugfix/16731-explicit-partprobeintrigeri2019-05-29144-6494/+9625
| | | |\ \ | | | |/ / | | |/| |
| | | * | Only probe for partitions on the boot device.anonym2019-05-201-2/+2
* | | | | Merge branch 'devel' into feature/tor-nightly-masterintrigeri2019-05-29171-6654/+9795
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'stable' into develintrigeri2019-05-297-136/+87
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'origin/bugfix/16748-use-syslinux-from-chroot' i...anonym2019-05-281-4/+8
| | |\ \ \
| | | * | | create-usb-image-from-iso: Add comment and variable prefix (refs: #16748)segfault2019-05-271-2/+6
| | | * | | create-usb-image-from-iso: Use syslinux from chroot (refs: #16748)segfault2019-05-231-3/+3
| | * | | | Merge remote-tracking branch 'origin/bugfix/16730-have-reproducible-build-att...anonym2019-05-276-132/+79
| | |\ \ \ \
| | | * \ \ \ Merge branch 'stable' into bugfix/16730-have-reproducible-build-attempt-use-s...intrigeri2019-05-231-0/+6
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Merge branch 'stable' into bugfix/16730-have-reproducible-build-attempt-use-s...intrigeri2019-05-2342-4861/+4726
| | | |\ \ \ \
| | | * | | | | auto/build: drop checks for conditions that are satisfied in supported build ...intrigeri2019-05-192-13/+0
| | | * | | | | Drop obsolete check for syslinux version.intrigeri2019-05-192-20/+0
| | | * | | | | auto/build: clone more build output to the log file.intrigeri2019-05-191-7/+8
| | | * | | | | auto/build: drop support for GnuPG 1.x.intrigeri2019-05-191-7/+3
| | | * | | | | build-tails: update comment.intrigeri2019-05-191-3/+5
| | | * | | | | auto/{build,config}: prefix informational message with "I: "intrigeri2019-05-192-10/+10
| | | * | | | | fatal(): prefix error message with "E: "intrigeri2019-05-191-1/+1
| | | * | | | | auto/config: consistently use fatal() to error out.intrigeri2019-05-191-19/+14
| | | * | | | | Honor $BASE_BRANCH_GIT_COMMIT (refs: #16730)intrigeri2019-05-192-8/+7
| | | * | | | | Make indentation consistent.intrigeri2019-05-191-31/+32
| | | * | | | | Revert "Build system: try to be smart again by fetching only the refs we need."intrigeri2019-05-191-16/+2
| * | | | | | | Merge branch 'stable' into develanonym2019-05-241-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Test suite: fix mistake with execute() vs spawn().anonym2019-05-241-2/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'stable' into develCyril Brulebois2019-05-23134-6322/+9539
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'master' into stableCyril Brulebois2019-05-23121-1623/+4991
| | |\ \ \ \ \