summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | * | | | | Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-10-25
| | | | |\ \ \ \ \
| | | | | * | | | | bump to 0.2.5.15-devNick Mathewson2017-10-25
| | | | * | | | | | bump to 0.2.8.16-devNick Mathewson2017-10-25
| | | * | | | | | | bump to 0.2.9.13-devNick Mathewson2017-10-25
| | * | | | | | | | bump to 0.3.0.12-devNick Mathewson2017-10-25
| * | | | | | | | | bump to 0.3.1.8-devNick Mathewson2017-10-25
* | | | | | | | | | Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2Nick Mathewson2017-10-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rewrite bridge addresses earlierTaylor Yu2017-10-24
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'feature18329_029_squashed' into maint-0.3.2Nick Mathewson2017-10-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updates to fix check-spaces/check-changes warningsNick Mathewson2017-10-24
| * | | | | | | | | | Adjust test to allow hyphens too.Nick Mathewson2017-10-24
* | | | | | | | | | | Merge branch 'feature18329_029_squashed' into maint-0.3.2Nick Mathewson2017-10-24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | test: Add unittest for descriptors with BridgeDistribution option.Isis Lovecruft2017-10-24
| * | | | | | | | | | doc: Improve documentation for check_bridge_distribution_setting().Isis Lovecruft2017-10-24
| * | | | | | | | | | Always set bridge-distribution-request on bridges' descriptors.Nick Mathewson2017-10-24
| * | | | | | | | | | Tweak the documentation for BridgeDistributionNick Mathewson2017-10-24
| * | | | | | | | | | Add new BridgeDistribution config optionRoger Dingledine2017-10-24
* | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-10-24
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-10-24
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-10-24
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | bump version in the other places :/Nick Mathewson2017-10-24
| | * | | | | | | | | bump version in the other places :/Nick Mathewson2017-10-24
* | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-10-24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-10-24
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-10-24
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-10-24
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-10-24
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | | | * | | | | | bump to 0.2.5.15Nick Mathewson2017-10-24
| | | | * | | | | | | bump to 0.2.8.16Nick Mathewson2017-10-24
| | | * | | | | | | | bump to 0.2.9.13Nick Mathewson2017-10-24
| | * | | | | | | | | bump to 0.3.0.12Nick Mathewson2017-10-24
| * | | | | | | | | | bump to 0.3.1.8Nick Mathewson2017-10-24
* | | | | | | | | | | Merge branch 'bug23952_032' into maint-0.3.2Nick Mathewson2017-10-24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Have LOG_PROTOCOL_WARN call its own functionNick Mathewson2017-10-23
* | | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-10-23
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-10-23
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-10-23
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9Nick Mathewson2017-10-23
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | | * | | | | | | Clear the address when node_get_prim_orport() returns earlyteor2017-10-15
* | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-10-23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Remove the length limit from write_http_status_lineNick Mathewson2017-10-23
* | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-10-23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-10-23
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-10-23
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-10-23
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Adjust test, now that there are 9 dirauths againNick Mathewson2017-10-23
* | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-10-23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-10-23
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-10-23
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-10-23
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /