nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,734 Commits 53 Branches 630 Tags 128 MiB
2bcd264a28
Commit Graph

25734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
teor
5bca66be49
Clear the address when node_get_prim_orport() returns early 
Fixes bug 23874; bugfix on 0.2.8.2-alpha.
 2017-10-15 16:48:36 -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
7a4741c233 Merge branch 'maint-0.3.0' into maint-0.3.1 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
bdf60fc7ce Merge branch 'maint-0.3.0' into maint-0.3.1 2017-10-05 11:03:36 -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
c50c98ba6a Make changes in server_mode() affect workers; fix a crash. 
Without this fix, changes from client to bridge don't trigger
transition_affects_workers(), so we would never have actually
initialized the cpuworkers.

Fixes bug 23693.  Bugfix on 3bcdb26267 0.2.6.3-alpha, which
fixed bug 14901 in the general case, but not on the case where
public_server_mode() did not change.
 2017-10-02 11:11:30 -04: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
Nick Mathewson
1a5746f8e1 Merge branch 'bug8185_025' into bug8185_031 2017-09-29 09:37:01 -04:00
Nick Mathewson
d256d4c0a6 Don't package cells onto marked circuits. 
This caused a BUG log when we noticed that the circuit had no
channel.  The likeliest culprit for exposing that behavior is
d769cab3e5, where we made circuit_mark_for_close() NULL out
the n_chan and p_chan fields of the circuit.

Fixes bug 8185; bugfix on 0.2.5.4-alpha, I think.
 2017-09-29 09:33:47 -04:00
Nick Mathewson
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
Alexander Færøy
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
Nick Mathewson
9b02641812 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-09-22 09:09:17 -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
David Goulet
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
Mike Perry
d70a793cfc Bug 23608: Mock time for all channelpadding tests. 2017-09-21 10:36:57 -04:00
Nick Mathewson
1a26c6be8b changes file for bug23568 2017-09-20 09:45:03 -04:00
Andreas Stieger
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
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
Nick Mathewson
654820ec1c Merge branch 'maint-0.3.0' into maint-0.3.1 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
346066a42e add rust registry to gitignore 2017-09-19 13:08:56 -04:00
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
0e85b71066 bump to 0.3.1.7-dev 2017-09-18 14:40:04 -04:00
Nick Mathewson
e78347fcc2 bump to 0.3.0.11-dev 2017-09-18 14:39:55 -04:00
Nick Mathewson
a57f1ff7ab bump to 0.2.9.12-dev 2017-09-18 14:39:46 -04:00
Nick Mathewson
0a72d1c8f1 bump to 0.2.8.15-dev 2017-09-18 14:39:40 -04:00
Nick Mathewson
63ae9ea316 Make hs_ntor_ref.py work with python3 2017-09-18 10:48:28 -04:00
Nick Mathewson
139bda4fe4 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-18 09:40:40 -04:00
Nick Mathewson
23c4592ee9 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-09-18 09:40:40 -04:00
Nick Mathewson
9d8d4cb3fa Merge branch 'trove-2017-008_030' into maint-0.3.0 2017-09-18 09:40:36 -04:00
Nick Mathewson
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
Nick Mathewson
314652dc16 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-09-18 09:39:46 -04:00
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