summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | * | Add UDF:s for Tails 2.11.1.anonym2017-03-134-0/+42
| | | * | Add Icecast to the wish list127.0.0.12017-03-131-0/+2
| | * | | Including sajolidas remarksUlrike Uhlig2017-03-131-4/+4
| | | |/ | | |/|
| | * | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2017-03-13217-4245/+11332
| | |\ \ | | | |/
| | | * Revert spam.intrigeri2017-03-131-1/+0
| | | * (no commit message)127.0.0.12017-03-121-0/+1
| | | * Merge remote-tracking branch 'xin/translate/known_issues'intrigeri2017-03-121-9/+8
| | | |\
| | | | * [fr] update translationxin2017-03-121-9/+8
| | | * | (no commit message)127.0.0.12017-03-121-4/+10
| | | |/
| | | * Cleanup.intrigeri2017-03-121-5/+1