5606cfae47
Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4
2019-03-14 06:41:14 +10:00
e91b999cf2
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
2019-03-08 19:37:18 +10:00
155b0f5521
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-06 14:29:33 -05:00
0c9cd7c487
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-06 14:29:29 -05:00
2e74edb53e
Update geoip and geoip6 to the March 4 2019 database.
2019-03-06 11:45:27 +01:00
f56645917e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-01 14:16:22 +10:00
76b55fde81
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-01 14:15:59 +10:00
7786198eef
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
2019-03-01 14:15:00 +10:00
c1ab538479
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
2019-03-01 14:14:51 +10:00
ecbc2e80a0
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
2019-03-01 14:14:26 +10:00
6a61a020ee
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:49:19 +10:00
be71cce9f8
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3
2019-02-28 10:48:46 +10:00
524731503e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:45:44 +10:00
3313444ef0
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-28 10:45:30 +10:00
d4b7975ce7
test/shared-random: use sr_state_free_all() rather than sr_state_free()
...
sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3.
Part of 29599.
2019-02-27 15:06:53 +10:00
64e082e892
Merge branch 'bug29599_029' into bug29599_033
2019-02-27 15:06:39 +10:00
4d9eb4dd0e
test/shared-random: Stop leaking shared random state in the unit tests
...
Stop leaking parts of the shared random state in the shared-random unit
tests.
Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27 15:04:40 +10:00
1a194beb2c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-27 09:37:50 +10:00
6c966b894c
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-27 09:37:36 +10:00
a56b9501f1
Bump to 0.3.4.11-dev
2019-02-21 13:23:46 -05:00
df70c44960
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" to avoid version bump
2019-02-21 13:23:22 -05:00
fb309f6eba
Bump to 0.3.3.12-dev
2019-02-21 13:22:56 -05:00
5062647918
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 10:08:14 -05:00
be84ed1a64
kist: Don't write above the highwater outbuf mark
...
KIST works by computing how much should be allowed to write to the kernel for
a given socket, and then it writes that amount to the outbuf.
The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.
This commit makes it for KIST to take into account the outbuf length when
computing the available space.
Bug found and patch by Rob Jansen.
Closes #29168 . TROVE-2019-001.
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-02-21 10:07:34 -05:00
508002a4c2
Bump to 0.3.4.11
2019-02-21 09:50:22 -05:00
7614a8b612
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 09:49:56 -05:00
41c2bf590b
Update to 0.3.3.12
2019-02-21 09:49:48 -05:00
4417ac880a
Fix a compiler warning on OpenBSD
...
malloc_options needs to be declared extern (and declaring it extern
means we need to initialize it separately)
Fixes bug 29145; bugfix on 0.2.9.3-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-02-19 11:38:32 -05:00
db209d4dba
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-12 09:56:49 -05:00
7ead2af622
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-12 09:56:49 -05:00
a3f9ddcf03
Update geoip and geoip6 to the February 5 2019 database.
2019-02-12 14:40:42 +01:00
8ea98c0f4c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-05 08:09:47 -05:00
4d7a0a1310
Update Cargo.lock with new comment; suppress 29244.
2019-02-01 16:38:23 +01:00
1c5f03fba7
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-23 09:51:02 -05:00
d1c0dbabfa
Merge branch 'maint-0.2.9' into maint-0.3.3
...
"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.
2019-01-23 09:50:38 -05:00
dd6c2b0ad7
maint-0.2.9: remove changes files that are merged in 0.2.9 releases
...
Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
2019-01-23 09:48:28 -05:00
761f1bf71e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-18 12:25:08 -05:00
4cca7fb99b
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-18 12:25:08 -05:00
89a0b77740
rend: stop warning when clients send multiple rend establish cells
...
Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.
Fixes bug 29029; bugfix on 0.2.5.7-rc.
2019-01-10 07:59:59 +10:00
41bb778227
Update to 0.3.4.10-dev
2019-01-07 21:17:34 -05:00
50a686e586
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"Ours" to avoid version bump.
2019-01-07 21:16:56 -05:00
b5fdb91ada
Update to 0.3.3.3.11-dev
2019-01-07 21:16:40 -05:00
ea47563dd7
Bump to 0.3.4.10
2019-01-07 10:22:42 -05:00
d8196dc200
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" merge to avoid version bump.
2019-01-07 10:22:13 -05:00
63eed6edff
Bump to 0.3.3.11
2019-01-07 10:21:59 -05:00
3d18903f53
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-07 08:43:45 -05:00
ba71b17865
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-07 08:43:45 -05:00
445d6750f7
Update geoip and geoip6 to the January 3 2019 database.
2019-01-07 09:00:29 +01:00
d7259b64d4
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 15:04:58 -05:00
fee2eaf2d4
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-04 15:04:58 -05:00
teor
Nick Mathewson
Karsten Loesing
David Goulet
Kris Katterjohn
Roger Dingledine