ebb71fcff6
Merge branch 'maint-0.3.5' into release-0.3.5
2019-03-06 14:29:41 -05:00
d6f77b99da
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-06 14:29:38 -05: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
64afe068fb
Merge branch 'maint-0.3.5' into release-0.3.5
2019-03-01 14:17:18 +10:00
1c248fa27d
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-01 14:16:59 +10: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
047fc003c2
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-28 10:49:40 +10:00
de0969ef78
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:49:33 +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
c725f598c4
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-28 10:46:07 +10:00
be29dfedd9
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:45:59 +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
60c2e4b852
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-27 09:38:12 +10:00
15dc33849e
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-27 09:38:04 +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
338ebb3821
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-26 10:48:11 -05:00
1216f99534
Merge branch 'tor-github/pr/691' into maint-0.3.5
2019-02-26 10:46:52 -05:00
81a1d7eb86
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-21 13:25:39 -05:00
955ca72f95
Bump to 0.3.5.8-dev
2019-02-21 13:24:42 -05:00
e1079266e7
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2019-02-21 13:23:52 -05: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
5030edfb53
0.3.5.8: copy changelog to releasenotes
2019-02-21 10:31:35 -05:00
2d7735ea06
Add TROVE-2019-001 to changelog for 0.3.5.8
2019-02-21 10:23:24 -05:00
4a8a1f76ea
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-21 10:08:14 -05:00
5062647918
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 10:08:14 -05:00
f10a23d9a4
Merge branch 'maint-0.3.5' into release-0.3.5
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
05bd43f425
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-21 09:58:52 -05:00
c663716b67
Bump to 0.3.5.8
2019-02-21 09:51:29 -05:00
46910c060f
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2019-02-21 09:50:46 -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
11760f9149
Start an 0.3.5.8 changelog
2019-02-21 09:41:55 -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
8dcecfb000
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-14 18:01:04 +02:00
Nick Mathewson
Karsten Loesing
teor
David Goulet
Kris Katterjohn
George Kadianakis