summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-21maint: Update Rust libc dependency from 0.2.22 to 0.2.39.Isis Lovecruft
Requires the update/libc-0.2.39 branch from https://github.com/isislovecruft/tor-rust-dependencies to be merged first.
2018-03-21maint: Add script for vendoring/updating Rust dependencies.Isis Lovecruft
* ADD documentation for usage both inside the script and in doc/HACKING/CodingStandardsRust.md * FIXES part of #25310: https://bugs.torproject.org/25310
2018-03-21doc: Document our current rough-draft policy on Rust dependencies.Isis Lovecruft
* FIXES #25310: https://bugs.torproject.org/25310
2018-03-20Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3Nick Mathewson
2018-03-20hs-v3: BUG() on missing descriptors during rotationDavid Goulet
Because of #25306 for which we are unable to reproduce nor understand how it is possible, this commit removes the asserts() and BUG() on the missing descriptors instead when rotating them. This allows us to log more data on error but also to let tor recover gracefully instead of dying. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-03-20Note that we require latest stable rust.Nick Mathewson
2018-03-20Log information on specific compression backends in the OOM handler.Alexander Færøy
This patch adds some additional logging to circuits_handle_oom() to give us more information about which specific compression backend that is using a certain amount of memory. See: https://bugs.torproject.org/25372
2018-03-19Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-19tests: Fix HS test against max IP lifetime.Isis Lovecruft
* FIXES part of #25450: https://bugs.torproject.org/25450
2018-03-19Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-19Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-03-19Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-03-19Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson
2018-03-19Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5Nick Mathewson
2018-03-19changes: Add changes file for bug25479.Isis Lovecruft
2018-03-19tests: Fix crash on win32 due to uninitialised mutex in bench.c.Gisle Vanem
Signed-off-by: Isis Lovecruft <isis@torproject.org>
2018-03-19Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-19Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2Nick Mathewson
2018-03-13Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3Nick Mathewson
2018-03-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-03-13Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-13Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-03-13Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-03-13Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson
2018-03-13Update geoip and geoip6 to the March 8 2018 database.Karsten Loesing
2018-03-13Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-13Merge branch 'bug25474_032' into maint-0.3.2Nick Mathewson
2018-03-13Add a missing prototype to our libevent configure stanza.Nick Mathewson
Fixes bug 25474; bugfix on 0.3.2.5-alpha.
2018-03-13Update the documentation in tor_api.hNick Mathewson
2018-03-08changes: Fix changes file for bug25450.Isis Lovecruft
It didn't like me insulting my patch, I guess.
2018-03-08test: Increase time limit for IP creation in an HS test.Isis Lovecruft
This should avoid most intermittent test failures on developer and CI machines, but there could (and probably should) be a more elegant solution. Also, this test was testing that the IP was created and its expiration time was set to a time greater than or equal to `now+INTRO_POINT_LIFETIME_MIN_SECONDS+5`: /* Time to expire MUST also be in that range. We add 5 seconds because * there could be a gap between setting now and the time taken in * service_intro_point_new. On ARM, it can be surprisingly slow... */ tt_u64_op(ip->time_to_expire, OP_GE, now + INTRO_POINT_LIFETIME_MIN_SECONDS + 5); However, this appears to be a typo, since, according to the comment above it, adding five seconds was done because the IP creation can be slow on some systems. But the five seconds is added to the *minimum* time we're comparing against, and so it actually functions to make this test *more* likely to fail on slower systems. (It should either subtract five seconds, or instead add it to time_to_expire.) * FIXES #25450: https://bugs.torproject.org/25450
2018-03-08Tweaks into AccountingStart documentation.Fernando Fernandez Mancera
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
2018-03-03changes file for 25378Nick Mathewson
2018-03-03Update tor.1.txt with the currently available log domains.Alexander Færøy
See: https://bugs.torproject.org/25378
2018-03-03Merge branch 'ticket23814' into maint-0.3.3Nick Mathewson
2018-03-03bump to 0.3.3.3-alpha-devNick Mathewson
2018-03-03Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
"ours" merge to avoid version bump.
2018-03-03bump version to 0.3.2.10-devNick Mathewson
2018-03-03Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
"ours" merge to avoid version bump
2018-03-03version bump to 0.3.1.10-devNick Mathewson
2018-03-03Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump.
2018-03-03Bump version to 0.2.9.15-devNick Mathewson
2018-03-01increment to 0.3.3.3-alphaNick Mathewson
2018-03-01Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
"ours" to avoid version bump.
2018-03-01version bump to 0.3.2.10Nick Mathewson
2018-03-01Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
"ours" to avoid version bump.
2018-03-01Update to 0.3.1.10Nick Mathewson
2018-03-01Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump.
2018-03-01version bump to 0.2.9.15Nick Mathewson