summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/feature/tor-nightly-master' into test/to...test/tor-bootstrap-robustness_tor-0.3.1.xanonym2017-03-252-0/+5
|\
| * Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-03-1435-108/+1315
| |\
| * \ Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-03-09208-4219/+9613
| |\ \
| * \ \ Merge branch 'devel' into feature/tor-nightly-masterintrigeri2017-03-06609-3323/+3595
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-02-07527-203134/+117992
| |\ \ \ \
| * | | | | Install Tor nightly builds from their master branch.intrigeri2016-12-082-2/+2
| * | | | | Also install tor-geoipdb 0.2.9.x, for consistency.intrigeri2016-12-081-1/+1
| * | | | | Merge remote-tracking branch 'origin/devel' into feature/12012-tor-0.2.9intrigeri2016-12-0211-21/+64
| |\ \ \ \ \
| * | | | | | Pin tor to tor-experimental-0.2.9.x-jessiesegfault2016-12-021-0/+4
| * | | | | | Add tor-experimental-0.2.9.x-jessie apt sourcesegfault2016-12-021-0/+1
* | | | | | | Disable all other tests but those about Tor bootstrapping issues.test/tor-bootstrap-robustness_tor-0.2.9.xanonym2017-03-2539-2270/+0
* | | | | | | WIP: testsanonym2017-03-256-15/+1060
* | | | | | | WIP: ISOanonym2017-03-259-338/+22
* | | | | | | Merge branch 'stable' into develanonym2017-03-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Test suite: fixup on possible fix for #11508.anonym2017-03-201-2/+2
* | | | | | | | Merge branch 'stable' into develanonym2017-03-191-10/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Test suite: try possible fix for #11508.anonym2017-03-191-10/+13
* | | | | | | | Merge branch 'stable' into develanonym2017-03-191-4/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Test suite: refine debug info collection of #11508.anonym2017-03-191-4/+7
* | | | | | | | Merge remote-tracking branch 'origin/devel' into develintrigeri2017-03-153-12/+9
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into develanonym2017-03-131-8/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/feature/12051-ikiwiki-from-Debian' into ...anonym2017-03-133-12/+9
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Install ikiwiki from jessie-backports, instead of our patched one (refs: #120...intrigeri2017-03-133-12/+9
* | | | | | | | | | Merge branch 'stable' into develintrigeri2017-03-1513-34/+103
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/stable' into stableintrigeri2017-03-151-8/+8
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Test suite: fixup on debugging info logging for PacketFu.anonym2017-03-131-8/+8
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Rakefile: fix exported variable name.intrigeri2017-03-151-1/+1
| * | | | | | | | Merge remote-tracking branch 'origin/master' into stableintrigeri2017-03-1511-25/+94
| |\ \ \ \ \ \ \ \
| | * | | | | | | | (no commit message)127.0.0.12017-03-141-14/+12
| | * | | | | | | | (no commit message)127.0.0.12017-03-141-24/+22
| | * | | | | | | | Link Code of Conduct and Social Contract togethersajolida2017-03-142-1/+4
| | * | | | | | | | Merge remote-tracking branch 'origin/master'sajolida2017-03-142-5/+27
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | (no commit message)127.0.0.12017-03-141-0/+2
| | | * | | | | | | | (no commit message)127.0.0.12017-03-141-1/+13
| | | * | | | | | | | translate.vm updates127.0.0.12017-03-141-4/+12
| | * | | | | | | | | Use the official name of the Tor Social Contractsajolida2017-03-131-1/+1
| | |/ / / / / / / /
| | * | | | | | | | Add note of preventing spamsajolida2017-03-131-0/+8
| | * | | | | | | | Add note about backupssajolida2017-03-131-0/+7
| | * | | | | | | | Add data source for personassajolida2017-03-131-0/+6
| | * | | | | | | | Add data source for personassajolida2017-03-131-2/+7
| | * | | | | | | | Add notes about research plans for VeraCryptsajolida2017-03-131-0/+10
| | * | | | | | | | Add data source for personassajolida2017-03-131-0/+9
| | * | | | | | | | Add RTIRsajolida2017-03-131-0/+3
| | * | | | | | | | Be more personalsajolida2017-03-131-3/+3
| | * | | | | | | | Create blueprint for Portuguese teamsajolida2017-03-131-0/+0
* | | | | | | | | | Merge branch 'stable' into develintrigeri2017-03-1318-115/+358
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into stableintrigeri2017-03-1318-115/+358
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2017-03-137-0/+125
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch '451f/feature/11987+remove_ikiwiki_timestamps' (...intrigeri2017-03-132-0/+81
| | | |\ \ \ \ \ \
| | | | * | | | | | Adding templates from latest ikiwiki versionUlrike Uhlig2017-03-132-0/+81