]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agochanges: file for 30117
teor [Thu, 11 Apr 2019 02:17:04 +0000 (12:17 +1000)] 
changes: file for 30117

6 years agoTravis: expand "make test-stem", so timelimit can signal python on timeout
teor [Thu, 11 Apr 2019 02:11:03 +0000 (12:11 +1000)] 
Travis: expand "make test-stem", so timelimit can signal python on timeout

Unlike kill, timelimit can only signal the process it launches. So we need
timelimit to launch python, not make.

Closes ticket 30117; diagnostic for 29437.

6 years agoTravis: use stem backtrace signals with timelimit
teor [Wed, 10 Apr 2019 11:15:04 +0000 (21:15 +1000)] 
Travis: use stem backtrace signals with timelimit

Part of 30117.

6 years agoActually I believe this should be an EINVAL.
Nick Mathewson [Tue, 9 Apr 2019 17:49:10 +0000 (13:49 -0400)] 
Actually I believe this should be an EINVAL.

6 years agoDetect and suppress an additional gmtime() warning in test_util.c
Nick Mathewson [Mon, 8 Apr 2019 21:02:14 +0000 (17:02 -0400)] 
Detect and suppress an additional gmtime() warning in test_util.c

Fixes bug 29922; bugfix on 0.2.9.3-alpha when we tried to capture
all these warnings.  No need to backport any farther than 0.3.5,
though -- these warnings don't cause test failures before then.

This one was tricky to find because apparently it only happened on
_some_ windows builds.

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Fri, 5 Apr 2019 23:33:20 +0000 (09:33 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.4
teor [Fri, 5 Apr 2019 23:33:11 +0000 (09:33 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
teor [Fri, 5 Apr 2019 23:32:53 +0000 (09:32 +1000)] 
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
teor [Fri, 5 Apr 2019 23:31:52 +0000 (09:31 +1000)] 
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
teor [Fri, 5 Apr 2019 23:30:52 +0000 (09:30 +1000)] 
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
teor [Fri, 5 Apr 2019 23:30:04 +0000 (09:30 +1000)] 
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
teor [Fri, 5 Apr 2019 23:28:58 +0000 (09:28 +1000)] 
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
teor [Fri, 5 Apr 2019 23:28:13 +0000 (09:28 +1000)] 
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9

6 years agoMerge branch 'bug29036-29962-034' into bug29036-29962-035
teor [Fri, 5 Apr 2019 02:58:32 +0000 (12:58 +1000)] 
Merge branch 'bug29036-29962-034' into bug29036-29962-035

6 years agoMerge branch 'bug29036-029' into bug29036-29962-034
teor [Fri, 5 Apr 2019 02:58:16 +0000 (12:58 +1000)] 
Merge branch 'bug29036-029' into bug29036-29962-034

6 years agoMakefile: actually, don't delete the gcno files
teor [Fri, 5 Apr 2019 02:56:29 +0000 (12:56 +1000)] 
Makefile: actually, don't delete the gcno files

We need to keep the gcno files, because they are created at compile time.

6 years agoMerge branch 'bug30021_029' into bug30021_035
Nick Mathewson [Thu, 4 Apr 2019 15:26:33 +0000 (11:26 -0400)] 
Merge branch 'bug30021_029' into bug30021_035

6 years agoDo not cache bogus results from classifying client ciphers
Nick Mathewson [Thu, 4 Apr 2019 15:24:55 +0000 (11:24 -0400)] 
Do not cache bogus results from classifying client ciphers

When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol.  This, in turn, was causing Stem
integration tests to stall in some cases.  Fixes bug 30021; bugfix
on 0.2.4.8-alpha.

6 years agoTravis: Terminate test-stem if it takes more than 9.5 minutes to run
teor [Thu, 4 Apr 2019 03:02:13 +0000 (13:02 +1000)] 
Travis: Terminate test-stem if it takes more than 9.5 minutes to run

(Travis terminates the job after 10 minutes of no output.)

Diagnostic for 29437.

Fixes bug 30011; bugfix on 0.3.5.4-alpha.

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Wed, 3 Apr 2019 13:27:43 +0000 (09:27 -0400)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.4
Nick Mathewson [Wed, 3 Apr 2019 13:27:42 +0000 (09:27 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.4

6 years agoUpdate geoip and geoip6 to the April 2 2019 database.
Karsten Loesing [Wed, 3 Apr 2019 07:26:28 +0000 (09:26 +0200)] 
Update geoip and geoip6 to the April 2 2019 database.

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Tue, 2 Apr 2019 01:45:22 +0000 (11:45 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.4
teor [Tue, 2 Apr 2019 01:45:13 +0000 (11:45 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.4

6 years agoMerge branch 'bug29036-29962-034' into bug29036-29962-035
teor [Mon, 1 Apr 2019 04:11:20 +0000 (14:11 +1000)] 
Merge branch 'bug29036-29962-034' into bug29036-29962-035

Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.

6 years agoTravis: merge before_cache from 29036 and 29962
teor [Mon, 1 Apr 2019 04:05:14 +0000 (14:05 +1000)] 
Travis: merge before_cache from 29036 and 29962

And add some useful comments

6 years agoAdd changes file
rl1987 [Sun, 31 Mar 2019 14:23:34 +0000 (17:23 +0300)] 
Add changes file

6 years agoCleanup cargo registry before each Rust-enabled build
rl1987 [Sun, 31 Mar 2019 13:58:32 +0000 (16:58 +0300)] 
Cleanup cargo registry before each Rust-enabled build

Also, refrain from caching target/.

See: https://levans.fr/rust_travis_cache.html

6 years agoMerge branch 'bug29036-029' into bug29036-29962-034
teor [Mon, 1 Apr 2019 04:07:58 +0000 (14:07 +1000)] 
Merge branch 'bug29036-029' into bug29036-29962-034

6 years agoMakefile: delete all the gcov-related files in reset-gcov
teor [Mon, 1 Apr 2019 03:49:27 +0000 (13:49 +1000)] 
Makefile: delete all the gcov-related files in reset-gcov

And fix a comment.

See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files

6 years agochanges: Use the first Tor version with CI coverage for the 29036 changes file
teor [Mon, 1 Apr 2019 03:40:16 +0000 (13:40 +1000)] 
changes: Use the first Tor version with CI coverage for the 29036 changes file

Otherwise, "make check-changes" will complain when we backport the change.

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Wed, 27 Mar 2019 00:02:40 +0000 (10:02 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
teor [Wed, 27 Mar 2019 00:01:45 +0000 (10:01 +1000)] 
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4

6 years agotest: Backport the 0.3.4 src/test/test-network.sh to 0.2.9
teor [Fri, 22 Mar 2019 03:20:23 +0000 (13:20 +1000)] 
test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9

We need a recent test-network.sh to use new chutney features in CI.

Fixes bug 29703; bugfix on 0.2.9.1-alpha.

6 years agotest/dir: add an extra argument to dirserv_read_measured_bandwidths()
teor [Thu, 21 Mar 2019 02:56:28 +0000 (12:56 +1000)] 
test/dir: add an extra argument to dirserv_read_measured_bandwidths()

Part of 29806.

6 years agoMerge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_merged
teor [Thu, 21 Mar 2019 02:04:30 +0000 (12:04 +1000)] 
Merge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_merged

Copy and paste the vote=0 code from the old src/or/dirserv.c
to the new src/feature/dirauth/bwauth.c.

6 years agobwauth: Ignore bandwidth file lines with "vote=0"
juga0 [Tue, 19 Mar 2019 11:48:42 +0000 (11:48 +0000)] 
bwauth: Ignore bandwidth file lines with "vote=0"

so that the relays that would be "excluded" from the bandwidth
file because of something failed can be included to diagnose what
failed, without still including these relays in the bandwidth
authorities vote.

Closes #29806.

6 years agoHandle errors from coveralls more gracefully.
Alexander Færøy [Wed, 20 Mar 2019 14:44:06 +0000 (15:44 +0100)] 
Handle errors from coveralls more gracefully.

Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more gracefully by echo'ing the
failure instead of doing a hard-failure.

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

6 years agoRun `make reset-gcov` after the script target in Travis CI is done.
Alexander Færøy [Mon, 18 Mar 2019 14:27:14 +0000 (15:27 +0100)] 
Run `make reset-gcov` after the script target in Travis CI is done.

This should ensure that GCDA files are never entering the cache of
Travis CI.

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

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Tue, 19 Mar 2019 23:48:03 +0000 (09:48 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.4
teor [Tue, 19 Mar 2019 23:47:55 +0000 (09:47 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5
teor [Tue, 19 Mar 2019 23:47:31 +0000 (09:47 +1000)] 
Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9
teor [Tue, 19 Mar 2019 23:46:10 +0000 (09:46 +1000)] 
Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
teor [Tue, 19 Mar 2019 05:43:05 +0000 (15:43 +1000)] 
Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5

6 years agotest/sr: update sr_state_free() to sr_state_free_all() in a comment
teor [Mon, 18 Mar 2019 01:28:34 +0000 (11:28 +1000)] 
test/sr: update sr_state_free() to sr_state_free_all() in a comment

6 years agoMerge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
teor [Mon, 18 Mar 2019 01:27:59 +0000 (11:27 +1000)] 
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge

6 years agotest/sr: Clear SRVs after init, and before setup
teor [Mon, 18 Mar 2019 01:12:25 +0000 (11:12 +1000)] 
test/sr: Clear SRVs after init, and before setup

Already merged to 0.4.0 and later in tor-github/pr/776.
Backported to 0.2.9 and later with minor comment changes.

Part of 29706.

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 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: 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 '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 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 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 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 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.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 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.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/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 agoChanges file for backporting 29530 to 0.3.5
teor [Mon, 25 Feb 2019 23:58:52 +0000 (09:58 +1000)] 
Changes file for backporting 29530 to 0.3.5

6 years agoDowngrade some LOG_ERR messages in the address/* tests to warnings
Nick Mathewson [Tue, 19 Feb 2019 19:02:32 +0000 (14:02 -0500)] 
Downgrade some LOG_ERR messages in the address/* tests to warnings

Fixes bug 29530, where the LOG_ERR messages were occurring when
we had no configured network, and so we were failing the unit tests
because of the recently-merged #28668.

Commit message edited by teor:

We backported 28668 and released it in 0.3.5.8.
This commit backports 29530 to 0.3.5.

Fixes bug 29530 in Tor 0.3.5.8.

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.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 to 0.3.5.8
Nick Mathewson [Thu, 21 Feb 2019 14:51:29 +0000 (09:51 -0500)] 
Bump to 0.3.5.8