f3e21c2763
0.3.3.12: copy changelog to releasenotes
2019-02-21 10:31:58 -05:00
9bb284e507
Changelog for 0.3.3.12
2019-02-21 10:24:14 -05:00
b478f8e405
Merge branch 'maint-0.3.3' into release-0.3.3
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
1725699e06
Merge branch 'maint-0.3.3' into release-0.3.3
2019-02-21 09:58:52 -05:00
41c2bf590b
Update to 0.3.3.12
2019-02-21 09:49:48 -05:00
4d67cffcf9
Start a changelog for 0.3.3.12
2019-02-21 09:49:09 -05:00
7ead2af622
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-12 09:56:49 -05:00
5f80ad5b4a
Merge branch 'maint-0.3.3' into release-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
9348742012
Merge branch 'maint-0.3.3' into release-0.3.3
2019-02-05 08:09:27 -05:00
4d7a0a1310
Update Cargo.lock with new comment; suppress 29244.
2019-02-01 16:38:23 +01:00
d213fbda2f
Merge branch 'maint-0.3.3' into release-0.3.3
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
b655e77ec5
Merge branch 'maint-0.3.3' into release-0.3.3
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
9609d13259
Fix the year for 0.3.3.11
2019-01-18 10:22:28 -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
7b792b990c
Merge branch 'maint-0.3.3' into release-0.3.3
2019-01-07 21:18:47 -05:00
b5fdb91ada
Update to 0.3.3.3.11-dev
2019-01-07 21:16:40 -05:00
801af9a7e3
fix issues noted by traumschule
...
plus fix a bonus typo
2019-01-07 12:46:18 -05:00
8eaa863179
Merge branch 'maint-0.3.3' into release-0.3.3
2019-01-07 10:23:40 -05:00
63eed6edff
Bump to 0.3.3.11
2019-01-07 10:21:59 -05:00
2d279eaa96
ChangeLog and ReleaseNotes for 0.3.3.11
2019-01-07 10:20:20 -05:00
ba71b17865
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-07 08:43:45 -05:00
0c75f83625
Merge branch 'maint-0.3.3' into release-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
fee2eaf2d4
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-04 15:04:58 -05:00
cba5c8829d
Merge branch 'maint-0.3.3' into release-0.3.3
2019-01-04 15:04:58 -05:00
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
dbef7af12c
Merge branch 'maint-0.3.3' into release-0.3.3
2019-01-04 14:57:06 -05:00
bf8bb9c526
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
2019-01-04 14:49:16 -05:00
d6552a7a23
Merge branch 'maint-0.3.3' into release-0.3.3
2019-01-03 09:02:39 -05:00
1ea3127188
Merge branch 'ticket28973_033_squashed' into maint-0.3.3
2019-01-03 09:01:40 -05:00
bf413829cb
Detect openssl bug 7712 and work around it.
...
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.
This closes tor issue 28973.
2019-01-03 09:00:47 -05:00
fd2d7c5d19
Merge branch 'maint-0.3.3' into release-0.3.3
2018-12-11 10:00:22 -05:00
93019b4787
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 10:00:22 -05:00
3b5188576f
Note ticket number in changes file for 24803
2018-12-11 10:00:19 -05:00
8be8cc50ed
Merge branch 'maint-0.3.3' into release-0.3.3
2018-12-11 09:41:05 -05:00
c1f9191581
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-11 09:41:04 -05:00
4991b29311
Fallbacks: Update the hard-coded fallback list in December 2018
...
Merge Phoul's two lists into teor's list.
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
157 fallbacks (92 new, 65 existing, 85 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-10 17:02:19 +10:00
78e177d622
Fallbacks: Update the hard-coded fallback list in December 2018
...
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
148 fallbacks (89 new, 59 existing, 91 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-07 16:43:10 +10:00
12b68854a0
Merge branch 'maint-0.3.3' into release-0.3.3
2018-12-06 09:26:32 -05:00
00341d97f3
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-12-06 09:26:32 -05:00
57798eb1cb
Update geoip and geoip6 to the December 5 2018 database.
2018-12-05 21:02:39 +01:00
8c1eb28d61
Merge branch 'maint-0.3.3' into release-0.3.3
2018-12-01 11:15:09 -05:00
d37dbb09c2
hs-v3: Do not close RP circuits when deleting an ephemeral service
...
Bug reported on tor-dev@ and here is the detail explanation of the issue:
https://lists.torproject.org/pipermail/tor-dev/2018-November/013558.html
Fixes bug #28619
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-11-26 14:45:53 -05:00
ffc7b81b5d
Test: Fix memory leaks and missing unmocks in entry guard tests
...
test_entry_guard_outdated_dirserver_exclusion leaks memory, and is
missing some unmocks.
Fixes 28554; bugfix on 0.3.0.1-alpha.
2018-11-22 16:42:32 +10:00
b3235e21ab
Merge branch 'maint-0.3.3' into release-0.3.3
2018-11-15 16:56:11 -05:00
Nick Mathewson
David Goulet
Karsten Loesing
Roger Dingledine
teor