summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Obsolete guardfraction torrc options.bug24456_032George Kadianakis2018-02-07
* Merge branch 'bug25125_032_01_squashed' into maint-0.3.2Nick Mathewson2018-02-02
|\
| * sched: When releasing a channel, do not BUG() if absent from the pending listDavid Goulet2018-02-02
|/
* Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2Nick Mathewson2018-02-01
|\
| * sched: Use the sched_heap_idx field to double-check our fix for 24700.Nick Mathewson2018-02-01
| * sched: Avoid adding the same channel twice to the KIST pending listDavid Goulet2018-01-31
* | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-02-01
|\ \
| * \ 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
* | | | Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2Nick Mathewson2018-02-01
|\ \ \ \
| * | | | ns: Add a before and after consensus has changed notificationDavid Goulet2018-01-31
| * | | | Revert "ns: Call notify_networkstatus_changed() after the new consensus is se...David Goulet2018-01-31
* | | | | Merge branch 'bug25105_032' into maint-0.3.2Nick Mathewson2018-01-31
|\ \ \ \ \
| * | | | | Look at the correct protocol for supports_v3_rendezvous_pointNick Mathewson2018-01-31
|/ / / / /
* | | | | Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2Nick Mathewson2018-01-31
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | ns: Call notify_networkstatus_changed() after the new consensus is set globallyDavid Goulet2018-01-31
* | | | hs-v3: Remove a BUG() when storing a descriptor in the client cacheDavid Goulet2018-01-31
|/ / /
* | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-01-31
|\ \ \ | |/ /
| * | But in most Earth cultures, there are 60s in a minute.Nick Mathewson2018-01-31
* | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-01-31
|\ \ \ | |/ /
| * | add a rate-limit.Nick Mathewson2018-01-31
* | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-01-31
|\ \ \ | |/ /
| * | If out-of-disk when saving a consensus cache entry, don't BUG.Nick Mathewson2018-01-26
| |/
* | When a tor_cert_T check fails, log the reason why.Nick Mathewson2018-01-26
* | Fix a memory leak in scheduler/loop_kistNick Mathewson2018-01-24
* | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-01-19
|\ \ | |/
| * 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 remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2Nick Mathewson2018-01-19
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'bug24895_031_02' into bug24895_032_02David Goulet2018-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 branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-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 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-01-18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'bug24826_031' into maint-0.3.1Nick Mathewson2018-01-18
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Improve fragile-hardening performance of consensus_split_lines.Nick Mathewson2018-01-16
* | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-01-17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove false positives from channel_is_client()Roger Dingledine2018-01-15
| |/ / / /
* | | | | Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2Nick Mathewson2018-01-17
|\ \ \ \ \