summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix configure libevent memory leakbug24279Alex Xu (Hello71)2017-11-151-1/+1
* Remove remove_file_if_very_old() -- nothing calls it.Nick Mathewson2017-11-142-23/+0
* Merge branch 'maint-0.3.2'Nick Mathewson2017-11-142-1/+5
|\
| * Merge remote-tracking branch 'dgoulet/bug24230_032_01' into maint-0.3.2Nick Mathewson2017-11-142-1/+5
| |\
| | * control: Fix wrong Action on failure to upload an HS descriptorDavid Goulet2017-11-102-1/+5
* | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-130-0/+0
|\ \ \ | |/ /
| * | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-130-0/+0
| |\ \
| | * \ Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-132-7/+3
| | |\ \
| | | * \ Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-132-7/+3
| | | |\ \
| | | | * \ Merge branch 'bug22895_027' into maint-0.2.9Nick Mathewson2017-11-132-7/+3
| | | | |\ \
* | | | | \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-130-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | add a missing subcategory to 23637, againNick Mathewson2017-11-131-1/+1
* | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-130-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-130-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-130-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-132-1/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-11-132-1/+4
| | | | |\ \ \
| | | | | * \ \ Merge branch 'bug23291_028' into maint-0.2.8Nick Mathewson2017-11-132-1/+4
| | | | | |\ \ \
* | | | | | \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-132-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-132-1/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | hs-v3: Fix consensus param "hsdir-interval" nameDavid Goulet2017-11-132-1/+4
* | | | | | | | | Remove changes files for those items already merged in 0.3.2Nick Mathewson2017-11-1321-111/+0
* | | | | | | | | Merge remote-tracking branch 'sebastian/bug24137'Nick Mathewson2017-11-132-3/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixup! Allow bootstrapping networks to have Exit flagsSebastian Hahn2017-11-041-4/+8
| * | | | | | | | | Allow bootstrapping networks to have Exit flagsSebastian Hahn2017-11-032-5/+10
* | | | | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2Nick Mathewson2017-11-132-9/+9
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'bug24247_032' into maint-0.3.2Nick Mathewson2017-11-132-2/+9
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-132-11/+17
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-132-11/+17
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9Nick Mathewson2017-11-132-11/+17
| | | | |\ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-132-0/+17
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Merge branch 'bug8185_025' into maint-0.2.9Nick Mathewson2017-11-132-0/+17
| | | | |\ \ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ \ Merge branch 'bug8185_031' into maint-0.3.1Nick Mathewson2017-11-132-0/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-11-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-11-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-11-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-11-132-1/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Merge branch 'ticket21953_029' into maint-0.2.9Nick Mathewson2017-11-132-1/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | Note in the rust doc that these comments are bidirectionalNick Mathewson2017-11-131-1/+3
* | | | | | | | | | | | | | | | Add corresponding rust-c coupling comments to CNick Mathewson2017-11-132-0/+9
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'chelseakomlo/24032-cargo-rust-sync'Nick Mathewson2017-11-133-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | annotate where C and Rust need to stay in syncChelsea Holland Komlo2017-11-113-1/+22
* | | | | | | | | | | | | | | | | update rust getting started for new buildChelsea Holland Komlo2017-11-131-2/+7