Commit Graph

31470 Commits

Author SHA1 Message Date
teor a0033c8552 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-27 09:38:26 +10:00
teor ef2925e742 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-27 09:38:19 +10:00
teor 15dc33849e Merge branch 'maint-0.3.4' into maint-0.3.5 2019-02-27 09:38:04 +10:00
teor 1a194beb2c Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-27 09:37:50 +10:00
teor 6c966b894c Merge branch 'maint-0.2.9' into maint-0.3.3 2019-02-27 09:37:36 +10:00
David Goulet ad1ffb6b2f Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-26 11:25:15 -05:00
David Goulet a5dd41b9af Merge branch 'tor-github/pr/638' into maint-0.4.0 2019-02-26 11:24:43 -05:00
David Goulet e4429d2341 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-26 10:48:13 -05:00
David Goulet 4746e1261b Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-26 10:48:12 -05:00
David Goulet 9c4ec414bd Merge branch 'tor-github/pr/692' into maint-0.4.0 2019-02-26 10:47:54 -05:00
David Goulet 1216f99534 Merge branch 'tor-github/pr/691' into maint-0.3.5 2019-02-26 10:46:52 -05:00
Nick Mathewson 9049b545c2 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-26 07:27:50 -05:00
Nick Mathewson 35257a1c69 Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0 2019-02-26 07:27:42 -05:00
Kris Katterjohn 1b9e77349f 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>
2019-02-25 16:03:42 -06:00
Nick Mathewson 37698d92bb Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-21 13:25:39 -05:00
Nick Mathewson 1bff5646e6 Bump to 0.4.0.2-alpha-dev 2019-02-21 13:25:33 -05:00
Nick Mathewson 5f44e1e5dc Merge branch 'maint-0.3.5' into maint-0.4.0
"ours" to avoid version bump.
2019-02-21 13:25:02 -05:00
Nick Mathewson 955ca72f95 Bump to 0.3.5.8-dev 2019-02-21 13:24:42 -05:00
Nick Mathewson e1079266e7 Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" to avoid version bump.
2019-02-21 13:23:52 -05:00
Nick Mathewson a56b9501f1 Bump to 0.3.4.11-dev 2019-02-21 13:23:46 -05:00
Nick Mathewson df70c44960 Merge branch 'maint-0.3.3' into maint-0.3.4
"ours" to avoid version bump
2019-02-21 13:23:22 -05:00
Nick Mathewson fb309f6eba Bump to 0.3.3.12-dev 2019-02-21 13:22:56 -05:00
Nick Mathewson feb744f0d4 Add TROVE-2019-001 to changelog for 0.4.0.2-alpha tor-0.4.0.2-alpha 2019-02-21 10:21:10 -05:00
Nick Mathewson 00a93b19cf Merge branch 'maint-0.3.5' into maint-0.4.0 2019-02-21 10:08:14 -05:00
Nick Mathewson 4a8a1f76ea Merge branch 'maint-0.3.4' into maint-0.3.5 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
Nick Mathewson fdcd2f2f86 Merge branch 'maint-0.4.0' into release-0.4.0 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 eb0600c6b4 Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-21 09:58:52 -05:00
Nick Mathewson df3484b2b0 Bump version to 0.4.0.2-alpha 2019-02-21 09:52:27 -05:00
Nick Mathewson 332fe15679 Merge branch 'maint-0.3.5' into maint-0.4.0
"ours" to avoid version bump.
2019-02-21 09:51:38 -05:00
Nick Mathewson c663716b67 Bump to 0.3.5.8 2019-02-21 09:51:29 -05:00
Nick Mathewson 46910c060f Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" to avoid version bump.
2019-02-21 09:50:46 -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 88290b7cda Use standard format for 0.4.0.2-alpha header 2019-02-21 09:42:14 -05:00
Nick Mathewson d97548a6fa Merge branch 'maint-0.4.0' into release-0.4.0 2019-02-21 09:10:34 -05:00
Nick Mathewson 34183f0d71 Fix a goofy change from abcde10fce that broke test-slow linking
boklm tracked this down, and it doesn't make sense.  It caused

This change goes back to the previous LDFLAGS line.
2019-02-21 09:10:15 -05:00
Nick Mathewson ba8c3735f0 Start work on an 0.4.0.2-alpha changelog. 2019-02-20 17:07:19 -05:00
Roger Dingledine 5ec65be8bf Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0 2019-02-20 10:39:28 -05:00
Roger Dingledine ccab4347e5 Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0 2019-02-20 10:35:56 -05:00
Roger Dingledine 249319ec5d fix typos from #28614 2019-02-20 10:32:47 -05:00
Nick Mathewson d32e407976 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.

Bug not in any released Tor.
2019-02-19 14:02:32 -05:00
Nick Mathewson c9ff6a7f83 Mark map_anon_nofork test as skipped in 0.4.0
This test fails in some environments; since the code isn't used in
0.4.0, let's disable it for now.

Band-aid solution for #29534; bug not in any released Tor.
2019-02-19 13:14:26 -05:00
Nick Mathewson 97e1539f7f Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0 2019-02-19 11:53:02 -05:00
Nick Mathewson 4df31adef7 Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0 2019-02-19 11:51:19 -05:00
Nick Mathewson 4bc55ed5ee Merge branch 'bug29145_029' into maint-0.4.0 2019-02-19 11:49:20 -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 b5f3a3d6a7 Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0 2019-02-19 11:34:21 -05:00