Nick Mathewson
c93ecb8189
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 09:06:34 -04:00
Nick Mathewson
1db5081ba1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 09:06:34 -04:00
Nick Mathewson
8cc147aa83
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 09:04:56 -04:00
David Goulet
15a699462d
dirauth: Add bastet to the default authorities
...
Fixes #23910
Based on a patch by dgoulet; backported to 0.2.5
2017-10-23 09:03:36 -04:00
Nick Mathewson
783e458c07
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:59:11 -04:00
Nick Mathewson
c958fda6e2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:59:11 -04:00
Nick Mathewson
9a1b385462
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 08:58:28 -04:00
Nick Mathewson
74e8fd22c9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:53:25 -04:00
Nick Mathewson
132e2f69b1
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-23 08:53:25 -04:00
Nick Mathewson
6f87a85897
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
2017-10-23 08:53:14 -04:00
Nick Mathewson
35574d4a9a
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:47:58 -04:00
Nick Mathewson
fcaf3335b4
Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9
2017-10-23 08:47:52 -04:00
Nick Mathewson
d29e4c0597
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:46:29 -04:00
Nick Mathewson
68dea082e7
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
2017-10-23 08:46:26 -04:00
Nick Mathewson
5d219ecf98
Update Longclaw's IP address; fixes 23592.
2017-10-17 14:00:30 -04:00
Nick Mathewson
91c17ffbd6
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:04:59 -04:00
Nick Mathewson
f7f55acae9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:04:59 -04:00
Nick Mathewson
43ebe54a24
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:04:59 -04:00
Nick Mathewson
2e21493a88
add missing subcategory in changes file
2017-10-05 11:04:54 -04:00
Nick Mathewson
d6bdec1595
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:03:35 -04:00
Nick Mathewson
ad7db10770
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:03:35 -04:00
Nick Mathewson
2984d99165
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:03:35 -04:00
Karsten Loesing
b9d9b16b76
Update geoip and geoip6 to the October 4 2017 database.
2017-10-05 16:56:14 +02:00
Nick Mathewson
f7222e6d8c
Clear outbuf_flushlen when we clear a connection's outbuf
...
When we added single_conn_free_bytes(), we cleared the outbuf on a
connection without setting outbuf_flushlen() to 0. This could cause
an assertion failure later on in flush_buf().
Fixes bug 23690; bugfix on 0.2.6.1-alpha.
2017-09-29 10:00:14 -04:00
David Goulet
dc5c9af6c3
hs: Avoid possible double circuit close on error
...
Fixes #23610
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-22 09:09:13 -04:00
Nick Mathewson
2c93be80d9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-20 08:32:55 -04:00
Nick Mathewson
746410fb24
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-20 08:32:55 -04:00
teor
8e52c46581
Remove longclaw's IPv6 address, as it will soon change
...
Authority IPv6 addresses were originally added in 0.2.8.1-alpha.
This leaves 3/8 directory authorities with IPv6 addresses, but there
are also 52 fallback directory mirrors with IPv6 addresses.
Resolves 19760.
2017-09-20 14:48:53 +10:00
Nick Mathewson
314652dc16
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-18 09:39:46 -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
dedafe95fe
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 17:09:47 -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
2b26815e09
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 17:49:18 -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
c894e9d3d4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 16:29:10 -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
f5092e711f
Merge branch 'maint-0.2.9' into maint-0.3.0
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
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
b548371f76
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
2017-08-03 09:12:23 -04:00
Nick Mathewson
3e68db02c4
In ntmain, call set_main_thread() before running the loop.
...
Patch from Vort; fixes bug 23081; bugfix on fd992deeea
2017-08-03 09:09:08 -04:00
Nick Mathewson
93b28972c1
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-08-03 08:44:31 -04:00
Nick Mathewson
9696021593
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-03 08:44:31 -04:00
Nick Mathewson
f33c96610f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-03 08:44:31 -04:00
Karsten Loesing
1280de42a4
Update geoip and geoip6 to the August 3 2017 database.
2017-08-03 10:00:54 +02:00
