summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Obsolete guardfraction torrc options.bug24456_031George Kadianakis2018-02-07
* Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1Nick Mathewson2018-02-01
|\
| * Changes file for 25070teor2018-01-30
| * Add Link protocol version 5 to the supported protocols list in protover.cteor2018-01-30
* | But in most Earth cultures, there are 60s in a minute.Nick Mathewson2018-01-31
* | add a rate-limit.Nick Mathewson2018-01-31
* | If out-of-disk when saving a consensus cache entry, don't BUG.Nick Mathewson2018-01-26
|/
* Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-19
|\
| * Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-19
| |\
| | * Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9Nick Mathewson2018-01-19
| | |\
* | | \ Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1Nick Mathewson2018-01-19
|\ \ \ \
| * \ \ \ Merge branch 'bug24895_029_02' into bug24895_031_02David Goulet2018-01-19
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2Roger Dingledine2018-01-19
| | * | | turn MAX_REND_FAILURES into a functionRoger Dingledine2018-01-19
| | * | | MAX_REND_FAILURES is 1, but we would try three timesRoger Dingledine2018-01-19
* | | | | Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0...Nick Mathewson2018-01-19
|\ \ \ \ \
| * | | | | Work around Travis CI ptrace regressionTaylor Yu2018-01-17
* | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-19
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-19
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson2018-01-19
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Work around Travis CI ptrace regressionTaylor Yu2018-01-17
* | | | | Merge branch 'bug24826_031' into maint-0.3.1Nick Mathewson2018-01-18
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Improve fragile-hardening performance of consensus_split_lines.Nick Mathewson2018-01-16
* | | | | Remove false positives from channel_is_client()Roger Dingledine2018-01-15
|/ / / /
* | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-08
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-08
| |\ \ \ | | |/ /
| | * | Add changes file for new fallback directory list.Nick Mathewson2018-01-08
| | * | Add 7 other fallback dirs from teor's testsNick Mathewson2018-01-08
| | * | Update the fallback_dirs.inc file: part 1Nick Mathewson2018-01-08
* | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-08
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-08
| |\ \ \ | | |/ /
| | * | Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson2018-01-08
| | |\ \ | | | |/
| | | * Update geoip and geoip6 to the January 5 2018 database.Karsten Loesing2018-01-08
* | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-05
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-05
| |\ \ \ | | |/ /
| | * | Merge branch 'teor_ticket24681_028' into maint-0.2.9Nick Mathewson2018-01-05
| | |\ \
| | | * | fix a wide lineNick Mathewson2018-01-05
| | | * | Make the default DirAuthorityFallbackRate 0.1teor2017-12-23
* | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-03
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-03
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'bug24633_029' into maint-0.2.9Nick Mathewson2018-01-03
| | |\ \ \
| | | * | | Fix the clz32 and clz64 settings on MSVC.Nick Mathewson2017-12-20
* | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2018-01-02
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2018-01-02
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9Nick Mathewson2018-01-02
| | |\ \ \ \
| | | * | | | Clear the address when we can't choose a reachable addressteor2017-12-25
| | | | |/ / | | | |/| |
* | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-12-21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-12-21
| |\ \ \ \ \ | | |/ / / /
| | * | | | Use monotime_coarse_absolute_msec() in destroy queueNick Mathewson2017-12-21
| | * | | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-12-21
| | |\ \ \ \ | | | |/ / /