torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
29,547 Commits 53 Branches 631 Tags
4fd31340f3355342deebf49b586ae38bc2e9c8fe
Commit Graph
29547 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 4fd31340f3 0.3.4.11: copy changelog to releasenotes tor-0.3.4.11 2019-02-21 10:31:44 -05:00
Nick Mathewson c41fc1b261 Add TROVE-2019-001 to changelog for 0.3.4.11 2019-02-21 10:23:50 -05:00
Nick Mathewson ebda5be955 Merge branch 'maint-0.3.4' into release-0.3.4 2019-02-21 10:08:14 -05:00
Nick Mathewson 5062647918 Merge branch 'maint-0.3.3' into maint-0.3.4 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 c19c726b75 Merge branch 'maint-0.3.4' into release-0.3.4 2019-02-21 09:58:52 -05:00
Nick Mathewson 508002a4c2 Bump to 0.3.4.11 2019-02-21 09:50:22 -05:00
Nick Mathewson 7614a8b612 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-21 09:49:56 -05:00
Nick Mathewson 41c2bf590b Update to 0.3.3.12 2019-02-21 09:49:48 -05:00
Nick Mathewson adaf1d0b85 Start a changelog for 0.3.4.11 2019-02-21 09:45:24 -05:00
Nick Mathewson db209d4dba Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-12 09:56:49 -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 b1da8b86f0 Merge branch 'maint-0.3.4' into release-0.3.4 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 d0f969a437 Merge branch 'maint-0.3.4' into release-0.3.4 2019-02-05 08:10:02 -05:00
Roger Dingledine 8ea98c0f4c Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-05 08:09:47 -05:00
Nick Mathewson 4d7a0a1310 Update Cargo.lock with new comment; suppress 29244. 2019-02-01 16:38:23 +01:00
Nick Mathewson 6f22a0c157 Merge branch 'maint-0.3.4' into release-0.3.4 2019-01-23 09:51:02 -05:00
Nick Mathewson 1c5f03fba7 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-23 09:51:02 -05:00
Nick Mathewson 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
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 001367eb13 Merge branch 'maint-0.3.4' into release-0.3.4 2019-01-18 12:25:08 -05:00
Nick Mathewson 761f1bf71e Merge branch 'maint-0.3.3' into maint-0.3.4 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
Nick Mathewson 33c8150dd7 Fix the year for 0.3.4.10 2019-01-18 10:22:21 -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 6fd998e2ee Merge branch 'maint-0.3.4' into release-0.3.4 2019-01-07 21:18:47 -05:00
Nick Mathewson 41bb778227 Update to 0.3.4.10-dev 2019-01-07 21:17:34 -05:00
Nick Mathewson 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
Nick Mathewson b5fdb91ada Update to 0.3.3.3.11-dev 2019-01-07 21:16:40 -05:00
Nick Mathewson 4f5ea89c11 Merge branch 'maint-0.3.4' into release-0.3.4 tor-0.3.4.10 2019-01-07 10:23:40 -05:00
Nick Mathewson ea47563dd7 Bump to 0.3.4.10 2019-01-07 10:22:42 -05:00
Nick Mathewson 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
Nick Mathewson 63eed6edff Bump to 0.3.3.11 2019-01-07 10:21:59 -05:00
Nick Mathewson 248056d9db Remove the changes files that went into the 0.3.4.10 changelog 2019-01-07 10:10:33 -05:00
Nick Mathewson 2ad0c9811b 0.3.4.10 : releasenotes 2019-01-07 10:09:53 -05:00
Nick Mathewson 575e934d02 Draft a changelog/releasenotes for 0.3.4.10 2019-01-07 10:08:58 -05:00
Nick Mathewson 3d18903f53 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-07 08:43:45 -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 28c95ed3fa Merge branch 'maint-0.3.4' into release-0.3.4 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 d7259b64d4 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-04 15:04:58 -05:00
Nick Mathewson fee2eaf2d4 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-01-04 15:04:58 -05:00
Nick Mathewson 366e9ba842 Merge branch 'maint-0.3.4' into release-0.3.4 2019-01-04 15:04:58 -05:00
Nick Mathewson 73de7b4bcb Merge branch 'bug21394_029_redux' into maint-0.2.9 2019-01-04 15:04:54 -05:00
Nick Mathewson fe3331b845 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-04 14:57:06 -05:00
Nick Mathewson 79f929723f Merge branch 'maint-0.3.4' into release-0.3.4 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 f810785277 Merge branch 'maint-0.3.4' into release-0.3.4 2019-01-04 14:36:02 -05:00
Nick Mathewson d47c9276de Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4 2019-01-04 14:34:38 -05:00