5d37d27007
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-23 08:46:29 -04:00
d29e4c0597
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-23 08:46:29 -04:00
68dea082e7
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
2017-10-23 08:46:26 -04:00
7a4741c233
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-05 11:04:59 -04:00
f7f55acae9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:04:59 -04:00
43ebe54a24
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:04:59 -04:00
91c17ffbd6
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:04:59 -04:00
2e21493a88
add missing subcategory in changes file
2017-10-05 11:04:54 -04:00
bdf60fc7ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-05 11:03:36 -04:00
ad7db10770
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:03:35 -04:00
2984d99165
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:03:35 -04:00
d6bdec1595
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:03:35 -04:00
b9d9b16b76
Update geoip and geoip6 to the October 4 2017 database.
2017-10-05 16:56:14 +02:00
82f109c2b3
Merge remote-tracking branch 'ahf-gitlab/bugs/23551-maint-0.3.1' into maint-0.3.1
2017-09-28 18:53:37 -04:00
8d6940814a
Better error handling when trying to compress/decompress into empty buffer.
...
This patch ensures that we return TOR_COMPRESS_BUFFER_FULL in case we
have a input bytes left to process, but are out of output buffer or in
case we need to finish where the compression implementation might need
to write an epilogue.
See: https://bugs.torproject.org/23551
2017-09-28 20:17:41 +02:00
9b02641812
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-22 09:09:17 -04:00
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
7f3dc8327a
hs: Avoid possible double circuit close on error
...
Fixes #23610
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-09-21 14:38:43 -04:00
d70a793cfc
Bug 23608: Mock time for all channelpadding tests.
2017-09-21 10:36:57 -04:00
1a26c6be8b
changes file for bug23568
2017-09-20 09:45:03 -04:00
427c2cc9e8
in zstd compression, fix 32 bit build
...
format '%lu' expects argument of type 'long unsigned int', but argument ... has type 'size_t'
Closes ticket 23568.
2017-09-20 09:43:08 -04:00
2c93be80d9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-20 08:32:55 -04:00
746410fb24
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-20 08:32:55 -04:00
654820ec1c
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-20 08:32:55 -04:00
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
346066a42e
add rust registry to gitignore
2017-09-19 13:08:56 -04:00
586c327e07
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" to avoid version bump.
2017-09-18 14:40:43 -04:00
23c5259a38
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" to avoid version bump.
2017-09-18 14:40:36 -04:00
42e12a3537
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" to avoid version bump.
2017-09-18 14:40:22 -04:00
0e85b71066
bump to 0.3.1.7-dev
2017-09-18 14:40:04 -04:00
e78347fcc2
bump to 0.3.0.11-dev
2017-09-18 14:39:55 -04:00
a57f1ff7ab
bump to 0.2.9.12-dev
2017-09-18 14:39:46 -04:00
0a72d1c8f1
bump to 0.2.8.15-dev
2017-09-18 14:39:40 -04:00
63ae9ea316
Make hs_ntor_ref.py work with python3
2017-09-18 10:48:28 -04:00
139bda4fe4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-18 09:40:40 -04:00
23c4592ee9
Merge branch 'maint-0.3.0' into maint-0.3.1
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
Nick Mathewson
Karsten Loesing
Alexander Færøy
David Goulet
Mike Perry
Andreas Stieger
teor