23c4592ee9
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-18 09:40:40 -04:00
139bda4fe4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-18 09:40:40 -04:00
9d8d4cb3fa
Merge branch 'trove-2017-008_030' into maint-0.3.0
2017-09-18 09:40:36 -04:00
7df7908905
Merge branch 'maint-0.2.8' into maint-0.3.0
...
This is an "ours" merge to avoid the conflict from the 0.2.8 version
of the fix for TROVE-2017-008.
2017-09-18 09:40:09 -04:00
314652dc16
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-18 09:39:46 -04:00
0ec72b0308
Merge branch 'trove-2017-008_028' into maint-0.2.8
2017-09-18 09:39:35 -04:00
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
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
49b5ad6b75
Merge branch 'bug23533_031' into maint-0.3.1
2017-09-15 14:39:23 -04:00
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
b440560b8b
bump to 0.3.1.7
2017-09-15 09:33:32 -04:00
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
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
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
348b225bd8
version bump: 0.3.0.11
2017-09-14 13:20:52 -04:00
3c6d4fe046
version bump: 0.2.9.12
2017-09-14 13:20:29 -04:00
26f68dfcef
version bump: 0.2.8.15
2017-09-14 13:20:14 -04:00
471e0096ad
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-14 10:15:38 -04:00
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
6fc47062af
Merge remote-tracking branch 'mikeperry/bug23077' into maint-0.3.1
2017-09-14 07:57:14 -04:00
361014255f
Bug 23077: Make channelpadding tests use mocked time.
2017-09-14 01:18:30 +00:00
dedafe95fe
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 17:09:47 -04:00
eb078a3bd5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-12 17:09:47 -04:00
3138fe2e69
Merge branch 'bug15582_029' into maint-0.2.9
2017-09-12 17:09:42 -04:00
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
befddf6d2a
Merge branch 'ticket17857_squashed' into maint-0.3.1
2017-09-12 10:29:00 -04:00
6689c95d06
Changes file for #17857 .
2017-09-12 10:28:45 -04:00
6d221c8f37
Ticket #17857 : Apply padding off-switch to existing connections.
2017-09-12 10:28:45 -04:00
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
0729ba2868
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 09:23:57 -04:00
bac160b4e0
One more implicit fallthrough warning to fix on GCC 7
2017-09-12 09:22:50 -04:00
eaa8224cef
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 17:49:18 -04:00
2b26815e09
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 17:49:18 -04:00
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
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
d4f87073ae
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 16:29:10 -04:00
c894e9d3d4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 16:29:10 -04:00
6a49e3360b
Fix mixed-sign comparison warning in fix for 22797.
2017-09-11 16:29:06 -04:00
a25d97e530
Merge branch 'teor-bug22797-025' into maint-0.2.9
2017-09-11 16:28:59 -04:00
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
f5092e711f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-08 08:24:47 -04:00
7a83cf75dc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-08 08:24:47 -04:00
3cace828a9
Merge branch 'bug22644_029' into maint-0.2.9
2017-09-08 08:24:36 -04:00
a9d4df9a08
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-07 15:18:01 -04:00
54fb1d0f7f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-07 15:18:01 -04:00
bcf2b413c3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-09-07 15:18:00 -04:00
08592c95fa
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-07 15:18:00 -04:00
09618ffe38
Update geoip and geoip6 to the September 6 2017 database.
2017-09-07 21:06:16 +02:00
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
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
Martin Kepplinger
Mike Perry
Andreas Stieger
Karsten Loesing