08cc2cc692
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-26 10:32:53 -04:00
ca2d9cbb93
Merge branch 'bug24903_029' into maint-0.3.3
2018-03-26 10:32:49 -04:00
7ebb1ba2c3
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-26 10:29:29 -04:00
33606405e3
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-26 10:29:29 -04:00
b5a6c03998
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-26 10:29:29 -04:00
068d092749
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-26 10:29:29 -04:00
33a80921a2
When extending a circuit's path length, clear onehop_tunnel.
...
There was a nonfatal assertion in pathbias_should_count that would
trigger if onehop_tunnel was set, but the desired_path_length was
greater than 1. This patch fixes that. Fixes bug 24903; bugfix on
0.2.5.2-alpha.
2018-03-26 09:17:50 -04:00
a4190d44fa
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-23 17:49:29 -04:00
eacfd29112
Fix windows compilation warnings in hs_service.c
...
These were breaking jenkins builds. Bugfix on 5804ccc9070dc54;
bug not in any released Tor.
2018-03-23 17:47:56 -04:00
7c360ee758
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-23 11:18:23 -04:00
79d3f401a5
Merge branch 'bug25560_rebased_033' into maint-0.3.3
2018-03-23 11:18:20 -04:00
657d5cbbbc
tests: Automatically detect Rust crates to test and also pass --verbose.
...
* FIXES #25560 : https://bugs.torproject.org/25560 .
2018-03-23 11:13:04 -04:00
f1a88ec11b
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-21 17:10:10 -04:00
2b31387410
Update src/ext/rust to latest master for libc update.
2018-03-21 17:09:59 -04:00
76d14aabd4
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-21 17:04:41 -04:00
95b78d4178
Merge branch 'bug25310_r1_033' into maint-0.3.3
2018-03-21 17:04:38 -04:00
00a473733d
maint: Update Rust libc dependency from 0.2.22 to 0.2.39.
...
Requires the update/libc-0.2.39 branch from
https://github.com/isislovecruft/tor-rust-dependencies to be merged
first.
2018-03-21 17:04:28 -04:00
9799394375
maint: Add script for vendoring/updating Rust dependencies.
...
* 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-21 17:04:28 -04:00
f9ccb2543d
doc: Document our current rough-draft policy on Rust dependencies.
...
* FIXES #25310 : https://bugs.torproject.org/25310
2018-03-21 17:04:04 -04:00
5b32475fb0
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-20 12:55:46 -04:00
b069979142
Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3
2018-03-20 12:54:51 -04:00
5804ccc907
hs-v3: BUG() on missing descriptors during rotation
...
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-20 12:54:05 -04:00
9f93bcd16d
Remove sb_poll check: all poll() calls are ok.
2018-03-20 08:30:21 -04:00
070eda5a21
Add the poll() syscall as permitted by the sandbox
...
Apparently, sometimes getpwnam will call this.
Fixes bug 25513.
2018-03-20 08:23:44 -04:00
0aff795b78
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-20 07:59:13 -04:00
74c767af29
Note that we require latest stable rust.
2018-03-20 07:58:29 -04:00
87c7e96eaa
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-20 07:50:46 -04:00
fd36bd8971
Log information on specific compression backends in the OOM handler.
...
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-20 07:47:19 -04:00
19421ffcf3
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-19 16:59:49 -04:00
910422e8fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 16:59:49 -04:00
66d3120634
tests: Fix HS test against max IP lifetime.
...
* FIXES part of #25450 : https://bugs.torproject.org/25450
2018-03-19 16:59:07 -04:00
1aa0ae2cc3
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-19 05:42:43 -04:00
3370b3cfef
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-19 05:42:43 -04:00
f5f4a68610
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-19 05:42:43 -04:00
85719b79b7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 05:42:43 -04:00
bc0de600b2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-19 05:42:43 -04:00
0eb2cdf99d
Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5
2018-03-19 05:42:38 -04:00
3bda8ab0ae
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-19 05:39:56 -04:00
9d1c7c3a8a
changes: Add changes file for bug25479.
2018-03-19 05:38:26 -04:00
53914f7dae
tests: Fix crash on win32 due to uninitialised mutex in bench.c.
...
Signed-off-by: Isis Lovecruft <isis@torproject.org >
2018-03-19 05:38:19 -04:00
f5f377ecb2
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-19 05:36:06 -04:00
296e429ebc
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 05:36:06 -04:00
a0cc7e9492
Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2
2018-03-19 05:35:39 -04:00
5ee93047cb
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-13 11:03:08 -04:00
f0f2fab5e1
Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
2018-03-13 11:02:34 -04:00
d60dc27555
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-13 10:59:30 -04:00
504dc5a93c
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-13 10:59:30 -04:00
6bc324c96a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 10:59:30 -04:00
09612b19c5
Merge branch 'maint-0.3.3' into release-0.3.3
2018-03-13 10:58:03 -04:00
950606dcc9
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 10:58:03 -04:00
Nick Mathewson
Isis Lovecruft
David Goulet
Alexander Færøy
Gisle Vanem