summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'fristonio/ticket-6236'HEADmasterNick Mathewson2018-03-19
|\
| * Remove duplicate code between parse_{c,s}method in transport.cDeepesh Pathak2018-02-24
* | Merge branch 'ticket25268_034_01'Nick Mathewson2018-03-19
|\ \
| * | add a changes file for 25268Nick Mathewson2018-03-19
| * | man: Update the CircuitPriorityHalflife entryDavid Goulet2018-02-15
| * | cmux: Always use the cmux policyDavid Goulet2018-02-15
| * | cmux: Remove round-robin circuit policyDavid Goulet2018-02-15
| * | cmux: Remove PARANOIA assert functionsDavid Goulet2018-02-15
| * | cmux: Rename cell_ewma_set_scale_factor()David Goulet2018-02-15
| * | cmux: Make EWMA policy mandatoryDavid Goulet2018-02-15
| |/
* | Merge branch 'maint-0.3.3'Nick Mathewson2018-03-19
|\ \
| * \ Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-03-19
| |\ \
| | * \ Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-03-19
| | |\ \
| | | * \ Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson2018-03-19
| | | |\ \
| | | | * \ Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson2018-03-19
| | | | |\ \
| | | | | * \ Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5Nick Mathewson2018-03-19
| | | | | |\ \
| | | | | | * | Document how to allow partial Travis failuresTaylor Yu2018-03-01
* | | | | | | | Merge branch 'maint-0.3.3'Nick Mathewson2018-03-19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | changes: Add changes file for bug25479.Isis Lovecruft2018-03-19
| * | | | | | | tests: Fix crash on win32 due to uninitialised mutex in bench.c.Gisle Vanem2018-03-19
* | | | | | | | Merge branch 'maint-0.3.3'Nick Mathewson2018-03-19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-03-19
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2Nick Mathewson2018-03-19
| | |\ \ \ \ \ \
| | | * | | | | | changes: Fix changes file for bug25450.Isis Lovecruft2018-03-08
| | | * | | | | | test: Increase time limit for IP creation in an HS test.Isis Lovecruft2018-03-08
* | | | | | | | | Merge remote-tracking branch 'public/restart_reset_bootstrap'Nick Mathewson2018-03-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reset all main.c state at exitNick Mathewson2017-12-11
| * | | | | | | | | In control.c, reset the bootstrapping status on shutdownNick Mathewson2017-12-11
* | | | | | | | | | DisableNetwork documentation improvisedArunaMaurya221B2018-03-13
* | | | | | | | | | Revised patch with 78 characters per lineArunaMaurya221B2018-03-13
* | | | | | | | | | PaddingStatistics documented properlyArunaMaurya221B2018-03-13
* | | | | | | | | | Merge remote-tracking branch 'teor/rust-std'Nick Mathewson2018-03-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update the primitive types explanation in the Rust coding standardsteor2018-02-27
* | | | | | | | | | | Merge branch 'maint-0.3.3'Nick Mathewson2018-03-13
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3Nick Mathewson2018-03-13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Tweaks into AccountingStart documentation.Fernando Fernandez Mancera2018-03-08
| | * | | | | | | | | | Improve the documentation of AccountingStart parameter.Fernando Fernandez Mancera2018-02-12
* | | | | | | | | | | | Merge branch 'maint-0.3.3'Nick Mathewson2018-03-13
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-03-13
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-03-13
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-03-13
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2018-03-13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | / / / / / | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson2018-03-13
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson2018-03-13
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / | | | | | |/| | | | | |
| | | | | * | | | | | | Update geoip and geoip6 to the March 8 2018 database.Karsten Loesing2018-03-13
| | | | | | |_|_|_|/ / | | | | | |/| | | | |
* | | | | | | | | | | Merge branch 'maint-0.3.3'Nick Mathewson2018-03-13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson2018-03-13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'bug25474_032' into maint-0.3.2Nick Mathewson2018-03-13
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Add a missing prototype to our libevent configure stanza.Nick Mathewson2018-03-13
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'maint-0.3.3'Nick Mathewson2018-03-13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /