Nick Mathewson
0ec72b0308
Merge branch 'trove-2017-008_028' into maint-0.2.8
2017-09-18 09:39:35 -04:00
Nick Mathewson
09ea89764a
Fix log-uninitialized-stack bug in rend_service_intro_established.
...
Fixes bug 23490; bugfix on 0.2.7.2-alpha.
TROVE-2017-008
CVE-2017-0380
2017-09-18 09:32:41 -04:00
Nick Mathewson
4a2cbea6ce
Fix log-uninitialized-stack bug in rend_service_intro_established.
...
Fixes bug 23490; bugfix on 0.2.7.2-alpha.
TROVE-2017-008
CVE-2017-0380
2017-09-18 09:27:07 -04:00
Nick Mathewson
49b5ad6b75
Merge branch 'bug23533_031' into maint-0.3.1
2017-09-15 14:39:23 -04:00
Nick Mathewson
e05414d241
Fix several places where md-using relays would get wrong behavior.
...
This patch replaces a few calls to router_get_by_id_digest ("do we
have a routerinfo?") with connection_or_digest_is_known_relay ("do
we know this relay to be in the consensus, or have been there some
time recently?").
Found while doing the 21585 audit; fixes bug 23533. Bugfix on
0.3.0.1-alpha.
2017-09-15 09:35:59 -04:00
Nick Mathewson
b440560b8b
bump to 0.3.1.7
2017-09-15 09:33:32 -04:00
Nick Mathewson
2446d4acc5
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump.
2017-09-14 13:22:04 -04:00
Nick Mathewson
e468498469
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" merge to avoid version bump.
2017-09-14 13:21:52 -04:00
Nick Mathewson
f7b06202c7
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" merge to avoid version bump.
2017-09-14 13:21:28 -04:00
Nick Mathewson
348b225bd8
version bump: 0.3.0.11
2017-09-14 13:20:52 -04:00
Nick Mathewson
3c6d4fe046
version bump: 0.2.9.12
2017-09-14 13:20:29 -04:00
Nick Mathewson
26f68dfcef
version bump: 0.2.8.15
2017-09-14 13:20:14 -04:00
Nick Mathewson
471e0096ad
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-14 10:15:38 -04:00
Martin Kepplinger
a971018f6d
entrynodes.c: fix syntax error around BUG() statement
...
Fix those misplaced brackets.
Signed-off-by: Martin Kepplinger <martink@posteo.de>
2017-09-14 10:14:44 -04:00
Nick Mathewson
6fc47062af
Merge remote-tracking branch 'mikeperry/bug23077' into maint-0.3.1
2017-09-14 07:57:14 -04:00
Mike Perry
361014255f
Bug 23077: Make channelpadding tests use mocked time.
2017-09-14 01:18:30 +00:00
Nick Mathewson
dedafe95fe
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 17:09:47 -04:00
Nick Mathewson
eb078a3bd5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-12 17:09:47 -04:00
Nick Mathewson
3138fe2e69
Merge branch 'bug15582_029' into maint-0.2.9
2017-09-12 17:09:42 -04:00
Nick Mathewson
d9e2db1efd
Avoid sscanf() warnings from openbsd in the unit tests
...
OpenBSD doesn't like tricks where you use a too-wide sscanf argument
for a too-narrow array, even when you know the input string
statically. The fix here is just to use bigger buffers.
Fixes 15582; bugfix on a3dafd3f58
2017-09-12 16:01:12 -04:00
Nick Mathewson
befddf6d2a
Merge branch 'ticket17857_squashed' into maint-0.3.1
2017-09-12 10:29:00 -04:00
Mike Perry
6689c95d06
Changes file for #17857 .
2017-09-12 10:28:45 -04:00
Mike Perry
6d221c8f37
Ticket #17857 : Apply padding off-switch to existing connections.
2017-09-12 10:28:45 -04:00
Nick Mathewson
469189d84a
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid torgzip.c change, since torgzip has been replaced.
2017-09-12 09:24:20 -04:00
Nick Mathewson
0729ba2868
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 09:23:57 -04:00
Nick Mathewson
bac160b4e0
One more implicit fallthrough warning to fix on GCC 7
2017-09-12 09:22:50 -04:00
Nick Mathewson
eaa8224cef
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 17:49:18 -04:00
Nick Mathewson
2b26815e09
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 17:49:18 -04:00
Andreas Stieger
6cd5a80275
Fix GCC 7 -Wimplicit-fallthrough warnings
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
or break, as required.
2017-09-11 17:47:04 -04:00
Andreas Stieger
b81a2e8f46
Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
Follow-up to e5f464, fixes Ticket 22446 for 32 bit.
[nick notes: Backport from 0.3.1.3-alpha.]
2017-09-11 17:45:07 -04:00
Nick Mathewson
d4f87073ae
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 16:29:10 -04:00
Nick Mathewson
c894e9d3d4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 16:29:10 -04:00
Nick Mathewson
6a49e3360b
Fix mixed-sign comparison warning in fix for 22797.
2017-09-11 16:29:06 -04:00
Nick Mathewson
a25d97e530
Merge branch 'teor-bug22797-025' into maint-0.2.9
2017-09-11 16:28:59 -04:00
Nick Mathewson
72ea4a8f08
Extract the important parts of the run-pending-timers function.
...
Our unit tests will need this, so that they can simulate advancing
time without getting libevent involved.
2017-09-11 13:48:39 -04:00
Nick Mathewson
f5092e711f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-08 08:24:47 -04:00
Nick Mathewson
7a83cf75dc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-08 08:24:47 -04:00
Nick Mathewson
3cace828a9
Merge branch 'bug22644_029' into maint-0.2.9
2017-09-08 08:24:36 -04:00
Nick Mathewson
a9d4df9a08
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-07 15:18:01 -04:00
Nick Mathewson
54fb1d0f7f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-07 15:18:01 -04:00
Nick Mathewson
bcf2b413c3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-09-07 15:18:00 -04:00
Nick Mathewson
08592c95fa
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-07 15:18:00 -04:00
Karsten Loesing
09618ffe38
Update geoip and geoip6 to the September 6 2017 database.
2017-09-07 21:06:16 +02:00
Nick Mathewson
12dad5ebf7
Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
...
Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha
respectively.
2017-09-07 09:20:00 -04:00
Nick Mathewson
9c404602a0
Add a stack trace to the warning at issue with 23105.
...
With luck, this will help us diagnose 23105 and fix it.
I also added a stack trace to the warning right before it, since why
not.
2017-09-07 08:49:11 -04:00
Nick Mathewson
fd0a894d28
Bump to 0.3.1.6-rc-dev
2017-09-05 10:20:34 -04:00
David Goulet
7eaf055b28
test: Fix memory leak in hs_descriptor/decode_bad_signature
...
Fixes #23319
Cherry-picked from master; bug not in any released Tor.
2017-09-05 09:26:21 -04:00
Nick Mathewson
2d55620a9e
Bump version to 0.3.1.6-rc
2017-09-05 08:30:52 -04:00
Nick Mathewson
4d97efd4d1
Merge branch 'bug22752_031_simple' into maint-0.3.1
2017-09-04 15:48:01 -04:00
Nick Mathewson
948be49ce0
22752: Improve comments to explain why we're doing this fix.
...
Based on questions and comments from dgoulet, I've tried to fill
in the reasoning about why these functions work in the way that they
do, so that it will be easier for future programmers to understand
why this code exists and works the way it does.
2017-09-04 11:54:49 -04:00
