Commit Graph

6866 Commits

Author SHA1 Message Date
teor 6f3f8bb1e4 Merge branch 'maint-0.3.3' into release-0.3.3 2019-02-28 10:45:37 +10:00
teor 3313444ef0 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-02-28 10:45:30 +10:00
teor 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
teor 3ecfb68bd7 Merge branch 'maint-0.3.3' into release-0.3.3 2019-02-27 09:37:43 +10:00
teor 6c966b894c Merge branch 'maint-0.2.9' into maint-0.3.3 2019-02-27 09:37:36 +10:00
Nick Mathewson 9bb284e507 Changelog for 0.3.3.12 2019-02-21 10:24:14 -05:00
Nick Mathewson b478f8e405 Merge branch 'maint-0.3.3' into release-0.3.3 2019-02-21 10:08:14 -05:00
David Goulet 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
Nick Mathewson 4d67cffcf9 Start a changelog for 0.3.3.12 2019-02-21 09:49:09 -05:00
Kris Katterjohn 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
Nick Mathewson 7ead2af622 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-02-12 09:56:49 -05:00
Nick Mathewson 5f80ad5b4a Merge branch 'maint-0.3.3' into release-0.3.3 2019-02-12 09:56:49 -05:00
Karsten Loesing a3f9ddcf03 Update geoip and geoip6 to the February 5 2019 database. 2019-02-12 14:40:42 +01:00
Roger Dingledine 9348742012 Merge branch 'maint-0.3.3' into release-0.3.3 2019-02-05 08:09:27 -05:00
Nick Mathewson 4d7a0a1310 Update Cargo.lock with new comment; suppress 29244. 2019-02-01 16:38:23 +01:00
Nick Mathewson 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
Nick Mathewson b655e77ec5 Merge branch 'maint-0.3.3' into release-0.3.3 2019-01-18 12:25:08 -05:00
Nick Mathewson 4cca7fb99b Merge branch 'maint-0.2.9' into maint-0.3.3 2019-01-18 12:25:08 -05:00
teor 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
Nick Mathewson 2d279eaa96 ChangeLog and ReleaseNotes for 0.3.3.11 2019-01-07 10:20:20 -05:00
Nick Mathewson ba71b17865 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-01-07 08:43:45 -05:00
Nick Mathewson 0c75f83625 Merge branch 'maint-0.3.3' into release-0.3.3 2019-01-07 08:43:45 -05:00
Karsten Loesing 445d6750f7 Update geoip and geoip6 to the January 3 2019 database. 2019-01-07 09:00:29 +01:00
Nick Mathewson 73de7b4bcb Merge branch 'bug21394_029_redux' into maint-0.2.9 2019-01-04 15:04:54 -05:00
Nick Mathewson dbef7af12c Merge branch 'maint-0.3.3' into release-0.3.3 2019-01-04 14:57:06 -05:00
Nick Mathewson bf8bb9c526 Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3 2019-01-04 14:49:16 -05:00
Nick Mathewson d6552a7a23 Merge branch 'maint-0.3.3' into release-0.3.3 2019-01-03 09:02:39 -05:00
Nick Mathewson 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
Nick Mathewson fd2d7c5d19 Merge branch 'maint-0.3.3' into release-0.3.3 2018-12-11 10:00:22 -05:00
Nick Mathewson 93019b4787 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-12-11 10:00:22 -05:00
Nick Mathewson 3b5188576f Note ticket number in changes file for 24803 2018-12-11 10:00:19 -05:00
Nick Mathewson 8be8cc50ed Merge branch 'maint-0.3.3' into release-0.3.3 2018-12-11 09:41:05 -05:00
Nick Mathewson c1f9191581 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-12-11 09:41:04 -05:00
teor 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
teor 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
Nick Mathewson 12b68854a0 Merge branch 'maint-0.3.3' into release-0.3.3 2018-12-06 09:26:32 -05:00
Nick Mathewson 00341d97f3 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-12-06 09:26:32 -05:00
Karsten Loesing 57798eb1cb Update geoip and geoip6 to the December 5 2018 database. 2018-12-05 21:02:39 +01:00
Nick Mathewson 8c1eb28d61 Merge branch 'maint-0.3.3' into release-0.3.3 2018-12-01 11:15:09 -05:00
David Goulet 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
teor 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
Nick Mathewson b3235e21ab Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-15 16:56:11 -05:00
Nick Mathewson cbe04d4550 Merge branch 'maint-0.2.9' into maint-0.3.3 2018-11-15 16:54:16 -05:00
Nick Mathewson e8708c2fbd Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-15 16:47:25 -05:00
Nick Mathewson aebe8a82c9 Merge branch 'bug26913_033' into maint-0.3.3 2018-11-15 16:47:22 -05:00
Nick Mathewson 8569166c70 Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
Resolved conflicts with the 26269 fix in 015fcd0e11.
2018-11-15 16:43:50 -05:00
Nick Mathewson b120d8b836 Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-15 16:37:41 -05:00
Nick Mathewson 34e4d5a783 Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3 2018-11-15 16:37:02 -05:00
Nick Mathewson cca803e2b0 Merge branch 'maint-0.3.3' into release-0.3.3 2018-11-14 07:55:07 -05:00
Nick Mathewson 26fd7c1d9c Changes file for bug 28419 2018-11-14 07:51:36 -05:00