summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-21Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-21Update src/ext/rust to latest master for libc update.Nick Mathewson
2018-03-21Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-21Merge branch 'bug25310_r1_033' into maint-0.3.3Nick Mathewson
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 'maint-0.3.3'Nick Mathewson
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-20Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-20Note that we require latest stable rust.Nick Mathewson
2018-03-20Merge branch 'maint-0.3.3'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-20Remove changes files already merged into 0.3.3Nick Mathewson
2018-03-19Move rust-specific declarations outside of #else blockNick Mathewson
These declarations need to exist unconditionally, but they were trapped inside an "#else /* !(defined(HAVE_SYSLOG_H)) */" block. Fixes a travis regression caused by 23881; bug not in any released tor.
2018-03-19Merge remote-tracking branch 'isis/bug23881_r1'Nick Mathewson
2018-03-19Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-19Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-19tests: Fix HS test against max IP lifetime.Isis Lovecruft
* FIXES part of #25450: https://bugs.torproject.org/25450
2018-03-19rust: Fix typo in name of logged function.Isis Lovecruft
2018-03-19rust: Remove #[no_mangle]s on two constants.Isis Lovecruft
These won't/shouldn't ever be called from C, so there's no reason to preserve naming.
2018-03-19Use tor_asprintf for in have_enough_mem_for_dircache()Neel Chauhan
(Fixes bug 20887)
2018-03-19Merge remote-tracking branch 'fristonio/ticket-6236'Nick Mathewson
2018-03-19Merge branch 'ticket25268_034_01'Nick Mathewson
2018-03-19add a changes file for 25268Nick Mathewson
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.3.3'Nick 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-19Merge branch 'maint-0.3.3'Nick 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.3'Nick Mathewson
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-14Merge remote-tracking branch 'public/restart_reset_bootstrap'Nick Mathewson
2018-03-13DisableNetwork documentation improvisedArunaMaurya221B
2018-03-13Revised patch with 78 characters per lineArunaMaurya221B
2018-03-13PaddingStatistics documented properlyArunaMaurya221B
2018-03-13Merge remote-tracking branch 'teor/rust-std'Nick Mathewson
2018-03-13Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-13Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3Nick Mathewson
2018-03-13Merge branch 'maint-0.3.3'Nick 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
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion