Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/feature/tor-nightly-master' into test/to...test/tor-bootstrap-robustness_tor-0.3.1.x | anonym | 2017-03-25 | 2 | -0/+5 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-master | intrigeri | 2017-03-14 | 35 | -108/+1315 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-master | intrigeri | 2017-03-09 | 208 | -4219/+9613 |
| |\ \ | |||||
| * \ \ | Merge branch 'devel' into feature/tor-nightly-master | intrigeri | 2017-03-06 | 609 | -3323/+3595 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-master | intrigeri | 2017-02-07 | 527 | -203134/+117992 |
| |\ \ \ \ | |||||
| * | | | | | Install Tor nightly builds from their master branch. | intrigeri | 2016-12-08 | 2 | -2/+2 |
| * | | | | | Also install tor-geoipdb 0.2.9.x, for consistency. | intrigeri | 2016-12-08 | 1 | -1/+1 |
| * | | | | | Merge remote-tracking branch 'origin/devel' into feature/12012-tor-0.2.9 | intrigeri | 2016-12-02 | 11 | -21/+64 |
| |\ \ \ \ \ | |||||
| * | | | | | | Pin tor to tor-experimental-0.2.9.x-jessie | segfault | 2016-12-02 | 1 | -0/+4 |
| * | | | | | | Add tor-experimental-0.2.9.x-jessie apt source | segfault | 2016-12-02 | 1 | -0/+1 |
* | | | | | | | Disable all other tests but those about Tor bootstrapping issues.test/tor-bootstrap-robustness_tor-0.2.9.x | anonym | 2017-03-25 | 39 | -2270/+0 |
* | | | | | | | WIP: tests | anonym | 2017-03-25 | 6 | -15/+1060 |
* | | | | | | | WIP: ISO | anonym | 2017-03-25 | 9 | -338/+22 |
* | | | | | | | Merge branch 'stable' into devel | anonym | 2017-03-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Test suite: fixup on possible fix for #11508. | anonym | 2017-03-20 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'stable' into devel | anonym | 2017-03-19 | 1 | -10/+13 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Test suite: try possible fix for #11508. | anonym | 2017-03-19 | 1 | -10/+13 |
* | | | | | | | | Merge branch 'stable' into devel | anonym | 2017-03-19 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Test suite: refine debug info collection of #11508. | anonym | 2017-03-19 | 1 | -4/+7 |
* | | | | | | | | Merge remote-tracking branch 'origin/devel' into devel | intrigeri | 2017-03-15 | 3 | -12/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/stable' into devel | anonym | 2017-03-13 | 1 | -8/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/feature/12051-ikiwiki-from-Debian' into ... | anonym | 2017-03-13 | 3 | -12/+9 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | Install ikiwiki from jessie-backports, instead of our patched one (refs: #120... | intrigeri | 2017-03-13 | 3 | -12/+9 |
* | | | | | | | | | | Merge branch 'stable' into devel | intrigeri | 2017-03-15 | 13 | -34/+103 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/stable' into stable | intrigeri | 2017-03-15 | 1 | -8/+8 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Test suite: fixup on debugging info logging for PacketFu. | anonym | 2017-03-13 | 1 | -8/+8 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Rakefile: fix exported variable name. | intrigeri | 2017-03-15 | 1 | -1/+1 |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into stable | intrigeri | 2017-03-15 | 11 | -25/+94 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | (no commit message) | 127.0.0.1 | 2017-03-14 | 1 | -14/+12 |
| | * | | | | | | | | (no commit message) | 127.0.0.1 | 2017-03-14 | 1 | -24/+22 |
| | * | | | | | | | | Link Code of Conduct and Social Contract together | sajolida | 2017-03-14 | 2 | -1/+4 |
| | * | | | | | | | | Merge remote-tracking branch 'origin/master' | sajolida | 2017-03-14 | 2 | -5/+27 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | (no commit message) | 127.0.0.1 | 2017-03-14 | 1 | -0/+2 |
| | | * | | | | | | | | (no commit message) | 127.0.0.1 | 2017-03-14 | 1 | -1/+13 |
| | | * | | | | | | | | translate.vm updates | 127.0.0.1 | 2017-03-14 | 1 | -4/+12 |
| | * | | | | | | | | | Use the official name of the Tor Social Contract | sajolida | 2017-03-13 | 1 | -1/+1 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | Add note of preventing spam | sajolida | 2017-03-13 | 1 | -0/+8 |
| | * | | | | | | | | Add note about backups | sajolida | 2017-03-13 | 1 | -0/+7 |
| | * | | | | | | | | Add data source for personas | sajolida | 2017-03-13 | 1 | -0/+6 |
| | * | | | | | | | | Add data source for personas | sajolida | 2017-03-13 | 1 | -2/+7 |
| | * | | | | | | | | Add notes about research plans for VeraCrypt | sajolida | 2017-03-13 | 1 | -0/+10 |
| | * | | | | | | | | Add data source for personas | sajolida | 2017-03-13 | 1 | -0/+9 |
| | * | | | | | | | | Add RTIR | sajolida | 2017-03-13 | 1 | -0/+3 |
| | * | | | | | | | | Be more personal | sajolida | 2017-03-13 | 1 | -3/+3 |
| | * | | | | | | | | Create blueprint for Portuguese team | sajolida | 2017-03-13 | 1 | -0/+0 |
* | | | | | | | | | | Merge branch 'stable' into devel | intrigeri | 2017-03-13 | 18 | -115/+358 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into stable | intrigeri | 2017-03-13 | 18 | -115/+358 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge branch 'master' of webmasters.boum.org:wiki | Ulrike Uhlig | 2017-03-13 | 7 | -0/+125 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge remote-tracking branch '451f/feature/11987+remove_ikiwiki_timestamps' (... | intrigeri | 2017-03-13 | 2 | -0/+81 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Adding templates from latest ikiwiki version | Ulrike Uhlig | 2017-03-13 | 2 | -0/+81 |