]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agoImplement an DormantCanceledByStartup option
Nick Mathewson [Sun, 17 Mar 2019 17:48:00 +0000 (13:48 -0400)] 
Implement an DormantCanceledByStartup option

Closes ticket 29357, and comes with appropriate notions of caution.

6 years agoMerge branch 'bug28656_035_squashed' into maint-0.4.0
Nick Mathewson [Fri, 15 Mar 2019 12:59:19 +0000 (08:59 -0400)] 
Merge branch 'bug28656_035_squashed' into maint-0.4.0

6 years agoStop logging a BUG() warning when tor is waiting for exit descriptors
teor [Tue, 5 Mar 2019 02:53:14 +0000 (12:53 +1000)] 
Stop logging a BUG() warning when tor is waiting for exit descriptors

Fixes bug 28656; bugfix on 0.3.5.1-alpha.

6 years agoMerge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
Nick Mathewson [Fri, 15 Mar 2019 12:54:30 +0000 (08:54 -0400)] 
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0
Nick Mathewson [Fri, 15 Mar 2019 12:52:50 +0000 (08:52 -0400)] 
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0

6 years agorelays shouldn't close idle rend circuits
Roger Dingledine [Sat, 9 Mar 2019 08:18:25 +0000 (03:18 -0500)] 
relays shouldn't close idle rend circuits

Allow connections to single onion services to remain idle without being
disconnected.

Relays acting as rendezvous points for single onion services were
mistakenly closing idle established rendezvous circuits after 60 seconds,
thinking that they are unused directory-fetching circuits that had served
their purpose.

Fixes bug 29665; bugfix on 0.2.1.26.

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Wed, 13 Mar 2019 21:00:43 +0000 (07:00 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Wed, 13 Mar 2019 20:59:09 +0000 (06:59 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.4
teor [Wed, 13 Mar 2019 20:56:38 +0000 (06:56 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
teor [Wed, 13 Mar 2019 20:56:09 +0000 (06:56 +1000)] 
Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
teor [Wed, 13 Mar 2019 20:55:57 +0000 (06:55 +1000)] 
Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4

6 years agoMerge branch 'bug28096-029-squashed' into bug28096-034-squashed
teor [Wed, 13 Mar 2019 20:53:17 +0000 (06:53 +1000)] 
Merge branch 'bug28096-029-squashed' into bug28096-034-squashed

Merge the new code, and preserve the #else macro comment from 0.3.4.

6 years agoMerge remote-tracking branch 'nickm/bug27073_029' into bug27073_034
teor [Wed, 13 Mar 2019 20:47:32 +0000 (06:47 +1000)] 
Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034

Replace == with OP_EQ in test macros.

6 years agoMerge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4
teor [Wed, 13 Mar 2019 20:41:14 +0000 (06:41 +1000)] 
Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:37:50 +0000 (06:37 +1000)] 
Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:37:17 +0000 (06:37 +1000)] 
Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:36:47 +0000 (06:36 +1000)] 
Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:36:11 +0000 (06:36 +1000)] 
Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:35:05 +0000 (06:35 +1000)] 
Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9

6 years agotest/sr: Clear SRVs after init, and before setup
teor [Wed, 13 Mar 2019 05:27:48 +0000 (15:27 +1000)] 
test/sr: Clear SRVs after init, and before setup

Part of 29706.

6 years agoFix #28525 changes file that is breaking CI.
George Kadianakis [Tue, 12 Mar 2019 18:11:51 +0000 (20:11 +0200)] 
Fix #28525 changes file that is breaking CI.

6 years agoMerge branch 'tor-github/pr/763' into maint-0.4.0
George Kadianakis [Tue, 12 Mar 2019 16:11:35 +0000 (18:11 +0200)] 
Merge branch 'tor-github/pr/763' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
Nick Mathewson [Tue, 12 Mar 2019 15:03:37 +0000 (11:03 -0400)] 
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0

6 years agotest/sr: update sr_state_free() to sr_state_free_all()
teor [Tue, 12 Mar 2019 01:34:52 +0000 (11:34 +1000)] 
test/sr: update sr_state_free() to sr_state_free_all()

The function name changed between 0.2.9 and 0.3.4.

6 years agoMerge branch bug29706_029_refactor into bug29706_034_refactor
teor [Tue, 12 Mar 2019 01:31:52 +0000 (11:31 +1000)] 
Merge branch bug29706_029_refactor into bug29706_034_refactor

6 years agosr: BUG() on NULL sr_state before doing a state_query_*()
teor [Tue, 12 Mar 2019 01:09:48 +0000 (11:09 +1000)] 
sr: BUG() on NULL sr_state before doing a state_query_*()

Part of #29706.

6 years agosr: Check for replacing a SRV pointer with the same pointer
teor [Tue, 12 Mar 2019 00:24:34 +0000 (10:24 +1000)] 
sr: Check for replacing a SRV pointer with the same pointer

Check if the new pointer is the same as the old one: if it is, it's
probably a bug:
* the caller may have confused current and previous, or
* they may have forgotten to sr_srv_dup().

Putting NULL multiple times is allowed.

Part of 29706.

6 years agoMerge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
Nick Mathewson [Mon, 11 Mar 2019 13:45:31 +0000 (09:45 -0400)] 
Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0

6 years agosr: rename srv_dup() to sr_srv_dup()
teor [Sat, 9 Mar 2019 01:48:05 +0000 (11:48 +1000)] 
sr: rename srv_dup() to sr_srv_dup()

6 years agosr: Free SRVs before replacing them in state_query_put_()
teor [Sat, 9 Mar 2019 00:50:55 +0000 (10:50 +1000)] 
sr: Free SRVs before replacing them in state_query_put_()

Refactor the shared random state's memory management so that it actually
takes ownership of the shared random value pointers.

Fixes bug 29706; bugfix on 0.2.9.1-alpha.

6 years agotest/sr: Free SRVs before replacing them in test_sr_setup_srv()
teor [Sat, 9 Mar 2019 00:50:07 +0000 (10:50 +1000)] 
test/sr: Free SRVs before replacing them in test_sr_setup_srv()

Stop leaking parts of the shared random state in the shared-random unit
tests. The previous fix in 29599 was incomplete.

Fixes bug 29706; bugfix on 0.2.9.1-alpha.

6 years agoMerge branch 'pr_719_squashed_040' into maint-0.4.0
Nick Mathewson [Fri, 8 Mar 2019 15:25:43 +0000 (10:25 -0500)] 
Merge branch 'pr_719_squashed_040' into maint-0.4.0

6 years agoBug 29204: Inspect circuit queues before sending padding.
Mike Perry [Thu, 21 Feb 2019 01:34:55 +0000 (01:34 +0000)] 
Bug 29204: Inspect circuit queues before sending padding.

Mitigates OOM conditions at relays.

6 years agoMerge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
teor [Fri, 8 Mar 2019 09:37:18 +0000 (19:37 +1000)] 
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Fri, 8 Mar 2019 04:11:46 +0000 (14:11 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5
teor [Fri, 8 Mar 2019 04:11:14 +0000 (14:11 +1000)] 
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5

6 years agoMerge remote-tracking branch 'bug28525_029' into maint-0.3.5
teor [Fri, 8 Mar 2019 02:32:04 +0000 (12:32 +1000)] 
Merge remote-tracking branch 'bug28525_029' into maint-0.3.5

6 years agoMake tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware
Neel Chauhan [Sun, 3 Mar 2019 02:25:35 +0000 (21:25 -0500)] 
Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware

Fixes 28525.

6 years agoMerge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
Nick Mathewson [Thu, 7 Mar 2019 13:56:35 +0000 (08:56 -0500)] 
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
Nick Mathewson [Thu, 7 Mar 2019 13:34:15 +0000 (08:34 -0500)] 
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Wed, 6 Mar 2019 19:29:43 +0000 (14:29 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Wed, 6 Mar 2019 19:29:38 +0000 (14:29 -0500)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 6 Mar 2019 19:29:33 +0000 (14:29 -0500)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.3 maint-0.3.3
Nick Mathewson [Wed, 6 Mar 2019 19:29:29 +0000 (14:29 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

6 years agoUpdate geoip and geoip6 to the March 4 2019 database.
Karsten Loesing [Wed, 6 Mar 2019 10:45:27 +0000 (11:45 +0100)] 
Update geoip and geoip6 to the March 4 2019 database.

6 years agoprotover: Add missing Padding to translate_to_rust
David Goulet [Fri, 1 Mar 2019 18:50:00 +0000 (13:50 -0500)] 
protover: Add missing Padding to translate_to_rust

This commit also explicitly set the value of the PRT enum so we can match/pin
the C enum values to the Rust one in protover/ffi.rs.

Fixes #29631

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agodoc: Fix an incorrect comment about calling FreeLibrary() on Windows
teor [Mon, 4 Mar 2019 01:22:02 +0000 (11:22 +1000)] 
doc: Fix an incorrect comment about calling FreeLibrary() on Windows

There's an incorrect comment in compat_time.c that suggests we call
FreeLibrary() before we're done using the library's functions.
See 29642 for background.

Closes ticket 29643.

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Fri, 1 Mar 2019 04:17:31 +0000 (14:17 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Fri, 1 Mar 2019 04:16:59 +0000 (14:16 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
teor [Fri, 1 Mar 2019 04:16:22 +0000 (14:16 +1000)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
teor [Fri, 1 Mar 2019 04:15:59 +0000 (14:15 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

6 years agoMerge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
teor [Fri, 1 Mar 2019 04:15:00 +0000 (14:15 +1000)] 
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
teor [Fri, 1 Mar 2019 04:14:51 +0000 (14:14 +1000)] 
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
teor [Fri, 1 Mar 2019 04:14:26 +0000 (14:14 +1000)] 
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9

6 years agoBug 25733: Avoid assert failure if all circuits time out.
Mike Perry [Mon, 16 Apr 2018 22:49:27 +0000 (22:49 +0000)] 
Bug 25733: Avoid assert failure if all circuits time out.

Prior to #23100, we were not counting HS circuit build times in our
calculation of the timeout. This could lead to a condition where our timeout
was set too low, based on non HS circuit build times, and then we would
abandon all HS circuits, storing no valid timeouts in the histogram.

This commit avoids the assert.

6 years agoLog the correct "auto" port number for listening sockets
Kris Katterjohn [Mon, 21 Jan 2019 19:12:53 +0000 (13:12 -0600)] 
Log the correct "auto" port number for listening sockets

When "auto" was used for the port number for a listening socket, the
message logged after opening the socket would incorrectly say port 0
instead of the actual port used.

Fixes bug 29144; bugfix on 0.3.5.1-alpha

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
6 years agoMerge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
Nick Mathewson [Thu, 28 Feb 2019 16:20:26 +0000 (11:20 -0500)] 
Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Thu, 28 Feb 2019 00:49:47 +0000 (10:49 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Thu, 28 Feb 2019 00:49:33 +0000 (10:49 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
teor [Thu, 28 Feb 2019 00:49:19 +0000 (10:49 +1000)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3
teor [Thu, 28 Feb 2019 00:48:46 +0000 (10:48 +1000)] 
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Thu, 28 Feb 2019 00:46:14 +0000 (10:46 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Thu, 28 Feb 2019 00:45:59 +0000 (10:45 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
teor [Thu, 28 Feb 2019 00:45:44 +0000 (10:45 +1000)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
teor [Thu, 28 Feb 2019 00:45:30 +0000 (10:45 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

6 years agoappveyor: Do the 64-bit Windows Server 2016 job first
teor [Wed, 27 Feb 2019 21:40:15 +0000 (07:40 +1000)] 
appveyor: Do the 64-bit Windows Server 2016 job first

6 years agoappveyor: skip two redundant builds to speed up CI on Windows
teor [Wed, 27 Feb 2019 06:11:47 +0000 (16:11 +1000)] 
appveyor: skip two redundant builds to speed up CI on Windows

Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows
Server 2012 R2 job. The remaining 2 jobs still provide coverage of
64/32-bit, and Windows Server 2016/2012 R2.

Also set fast_finish, so failed jobs terminate the build immediately.

Fixes bug 29601; bugfix on 0.3.5.4-alpha.

6 years agoMerge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0
Nick Mathewson [Wed, 27 Feb 2019 14:59:33 +0000 (09:59 -0500)] 
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0

6 years agotest/shared-random: use sr_state_free_all() rather than sr_state_free()
teor [Wed, 27 Feb 2019 04:57:35 +0000 (14:57 +1000)] 
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.

6 years agoMerge branch 'bug29599_029' into bug29599_033
teor [Wed, 27 Feb 2019 05:06:39 +0000 (15:06 +1000)] 
Merge branch 'bug29599_029' into bug29599_033

6 years agotest/shared-random: Stop leaking shared random state in the unit tests
teor [Tue, 26 Feb 2019 12:14:30 +0000 (22:14 +1000)] 
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.

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Tue, 26 Feb 2019 23:38:19 +0000 (09:38 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Tue, 26 Feb 2019 23:38:04 +0000 (09:38 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
teor [Tue, 26 Feb 2019 23:37:50 +0000 (09:37 +1000)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
teor [Tue, 26 Feb 2019 23:37:36 +0000 (09:37 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

6 years agoMerge branch 'tor-github/pr/638' into maint-0.4.0
David Goulet [Tue, 26 Feb 2019 16:24:43 +0000 (11:24 -0500)] 
Merge branch 'tor-github/pr/638' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
David Goulet [Tue, 26 Feb 2019 15:48:12 +0000 (10:48 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'tor-github/pr/692' into maint-0.4.0
David Goulet [Tue, 26 Feb 2019 15:47:54 +0000 (10:47 -0500)] 
Merge branch 'tor-github/pr/692' into maint-0.4.0

6 years agoMerge branch 'tor-github/pr/691' into maint-0.3.5
David Goulet [Tue, 26 Feb 2019 15:46:52 +0000 (10:46 -0500)] 
Merge branch 'tor-github/pr/691' into maint-0.3.5

6 years agoFix crash bug in PT subsystem.
Alexander Færøy [Tue, 26 Feb 2019 14:26:33 +0000 (15:26 +0100)] 
Fix crash bug in PT subsystem.

This patch fixes a crash bug (assertion failure) in the PT subsystem
that could get triggered if the user cancels bootstrap via the UI in
TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which
called `process_free()` after it had called `process_terminate()`. This
leads to a crash when the various process callbacks returns with data
after the `process_t` have been freed using `process_free()`.

We solve this issue by ensuring that everywhere we call
`process_terminate()` we make sure to detach the `managed_proxy_t` from
the `process_t` (by calling `process_set_data(process, NULL)`) and avoid
calling `process_free()` at all in the transports code. Instead we just
call `process_terminate()` and let the process exit callback in
`managed_proxy_exit_callback()` handle the `process_free()` call by
returning true to the process subsystem.

See: https://bugs.torproject.org/29562

6 years agoMerge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0
Nick Mathewson [Tue, 26 Feb 2019 12:27:42 +0000 (07:27 -0500)] 
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0

6 years agoFix some error-checking logic and a misleading error message
Kris Katterjohn [Fri, 25 Jan 2019 21:52:40 +0000 (15:52 -0600)] 
Fix some error-checking logic and a misleading error message

When IPv4Only (IPv6Only) was used but the address could not be
interpreted as a IPv4 (IPv6) address, the error message referred
to the wrong IP version.

This also fixes up the error-checking logic so it's more precise
about what's being checked.

Fixes bug 13221; bugfix on 0.2.3.9-alpha

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
6 years agoBump to 0.4.0.2-alpha-dev
Nick Mathewson [Thu, 21 Feb 2019 18:25:33 +0000 (13:25 -0500)] 
Bump to 0.4.0.2-alpha-dev

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Thu, 21 Feb 2019 18:25:02 +0000 (13:25 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.

6 years agoBump to 0.3.5.8-dev
Nick Mathewson [Thu, 21 Feb 2019 18:24:42 +0000 (13:24 -0500)] 
Bump to 0.3.5.8-dev

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Thu, 21 Feb 2019 18:23:52 +0000 (13:23 -0500)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.

6 years agoBump to 0.3.4.11-dev
Nick Mathewson [Thu, 21 Feb 2019 18:23:46 +0000 (13:23 -0500)] 
Bump to 0.3.4.11-dev

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 21 Feb 2019 18:23:22 +0000 (13:23 -0500)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump

6 years agoBump to 0.3.3.12-dev
Nick Mathewson [Thu, 21 Feb 2019 18:22:56 +0000 (13:22 -0500)] 
Bump to 0.3.3.12-dev

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Thu, 21 Feb 2019 15:08:14 +0000 (10:08 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Thu, 21 Feb 2019 15:08:14 +0000 (10:08 -0500)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 21 Feb 2019 15:08:14 +0000 (10:08 -0500)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agokist: Don't write above the highwater outbuf mark
David Goulet [Thu, 24 Jan 2019 15:52:08 +0000 (10:52 -0500)] 
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>
6 years agoBump version to 0.4.0.2-alpha
Nick Mathewson [Thu, 21 Feb 2019 14:52:27 +0000 (09:52 -0500)] 
Bump version to 0.4.0.2-alpha

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Thu, 21 Feb 2019 14:51:38 +0000 (09:51 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.

6 years agoBump to 0.3.5.8
Nick Mathewson [Thu, 21 Feb 2019 14:51:29 +0000 (09:51 -0500)] 
Bump to 0.3.5.8

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Thu, 21 Feb 2019 14:50:46 +0000 (09:50 -0500)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump.

6 years agoBump to 0.3.4.11
Nick Mathewson [Thu, 21 Feb 2019 14:50:22 +0000 (09:50 -0500)] 
Bump to 0.3.4.11

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 21 Feb 2019 14:49:56 +0000 (09:49 -0500)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agoUpdate to 0.3.3.12
Nick Mathewson [Thu, 21 Feb 2019 14:49:48 +0000 (09:49 -0500)] 
Update to 0.3.3.12