summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Use less jargon in Scheduler sec. of man pageticket24254Matt Traudt2017-11-16
|
* Add notes about OS support for our scheduler typesMatt Traudt2017-11-16
|
* Merge branch 'maint-0.3.2'Nick Mathewson2017-11-15
|\
| * Merge branch 'bug24279_030' into maint-0.3.2Nick Mathewson2017-11-15
| |\
| | * whoops; add missing credit.Nick Mathewson2017-11-15
| | |
| * | Merge branch 'bug24279_030' into maint-0.3.2Nick Mathewson2017-11-15
| |\ \ | | |/
| | * Changes file for 24279.Nick Mathewson2017-11-15
| | |
| | * Fix configure libevent memory leakAlex Xu (Hello71)2017-11-15
| | | | | | | | | | | | Breaks build with externally-specified hardening flags.
* | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-15
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'asn/bug23662_032' into maint-0.3.2Nick Mathewson2017-11-15
| |\ \
| | * | Silence a warning about failed descriptor uploads.George Kadianakis2017-11-14
| | | | | | | | | | | | | | | | | | | | | | | | Due to #23662 this can happen under natural causes and does not disturb the functionality of the service. This is a simple 0.3.2 fix for now, and we plan to fix this properly in 0.3.3.
* | | | Remove remove_file_if_very_old() -- nothing calls it.Nick Mathewson2017-11-14
| | | |
* | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-14
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2Nick Mathewson2017-11-14
| |\ \ \ | | |/ / | |/| |
| | * | control: Fix wrong Action on failure to upload an HS descriptorDavid Goulet2017-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On failure to upload, the HS_DESC event would report "UPLOAD_FAILED" as the Action but it should have reported "FAILED" according to the spec. Fixes #24230 Signed-off-by: David Goulet <dgoulet@torproject.org>
* | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-13
|\ \ \ \ | |/ / /
| * | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-13
| |\ \ \
| | * \ \ Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-13
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-13
| | | |\ \
| | | | * \ Merge branch 'bug22895_027' into maint-0.2.9Nick Mathewson2017-11-13
| | | | |\ \
* | | | | \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | add a missing subcategory to 23637, againNick Mathewson2017-11-13
| | | | | | |
* | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-13
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-13
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-11-13
| | | | |\ \ \
| | | | | * \ \ Merge branch 'bug23291_028' into maint-0.2.8Nick Mathewson2017-11-13
| | | | | |\ \ \
* | | | | | \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | hs-v3: Fix consensus param "hsdir-interval" nameDavid Goulet2017-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dir-spec.txt specifies it to be "hsdir_interval" (underscore). Fixes #24262 Signed-off-by: David Goulet <dgoulet@torproject.org>
* | | | | | | | | Remove changes files for those items already merged in 0.3.2Nick Mathewson2017-11-13
| | | | | | | | |
* | | | | | | | | Merge remote-tracking branch 'sebastian/bug24137'Nick Mathewson2017-11-13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixup! Allow bootstrapping networks to have Exit flagsSebastian Hahn2017-11-04
| | | | | | | | | |
| * | | | | | | | | Allow bootstrapping networks to have Exit flagsSebastian Hahn2017-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relevant for non-test networks
* | | | | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-13
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2Nick Mathewson2017-11-13
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'bug24247_032' into maint-0.3.2Nick Mathewson2017-11-13
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-13
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-13
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-13
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-13
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9Nick Mathewson2017-11-13
| | | | |\ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-13
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Merge branch 'bug8185_025' into maint-0.2.9Nick Mathewson2017-11-13
| | | | |\ \ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ \ Merge branch 'bug8185_031' into maint-0.3.1Nick Mathewson2017-11-13
| | |\ \ \ \ \ \ \ \ \ \ \ \