summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Obsolete guardfraction torrc options.bug24456_030George Kadianakis2018-02-07
* 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
| |\
| | * 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 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 '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.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.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.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.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.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
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-12-21
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch 'bug24666_squashed_025' into maint-0.2.5Nick Mathewson2017-12-21
| | | |\ \
| | | | * | Move free to end of test function so coverity won't complain.Nick Mathewson2017-12-21
| | | | * | Move destroy cells into a separate queue type of their own, to save RAMNick Mathewson2017-12-21
* | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-12-20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-12-20
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-12-20
| | |\ \ \ | | | |/ /
| | | * | Update geoip and geoip6 to the December 6 2017 database.Karsten Loesing2017-12-20
| | | |/
* | | | rename changes fileNick Mathewson2017-12-12
* | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-12-11
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-12-11
| |\ \ \ | | |/ /
| | * | Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-12-11
| | |\ \ | | | |/
| | | * Merge branch 'bug24167_025' into maint-0.2.5Nick Mathewson2017-12-11
| | | |\
| | | | * Fix a traceback when closing a blocked connection "immediately".Nick Mathewson2017-11-16
* | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-12-11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-12-11
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-12-11
| | |\ \ \ | | | |/ /
| | | * | Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5Nick Mathewson2017-12-11
| | | |\ \
| | | | * | relay: Change bandwidth stats interval to 24 hoursDavid Goulet2017-11-27
* | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-12-11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9Nick Mathewson2017-12-11
| |\ \ \ \ \