]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
9 years agoAssert that memory held by rephist is freed
cypherpunks [Wed, 2 Dec 2015 09:11:32 +0000 (10:11 +0100)] 
Assert that memory held by rephist is freed

The internal memory allocation and history object counters of the
reputation code can be used to verify the correctness of (part of) the
code. Using these counters revealed an issue where the memory allocation
counter is not decreased when the bandwidth arrays are freed.

A new function ensures the memory allocation counter is decreased when a
bandwidth array is freed.

This commit also removes an unnecessary cast which was found while
working on the code.

9 years agoMerge branch 'refactor-effective-entry'
Nick Mathewson [Wed, 9 Dec 2015 16:05:41 +0000 (11:05 -0500)] 
Merge branch 'refactor-effective-entry'

9 years agoTweak policies_log_first_redundant_entry even more
Nick Mathewson [Wed, 9 Dec 2015 16:04:56 +0000 (11:04 -0500)] 
Tweak policies_log_first_redundant_entry even more

  * Use smartlist_foreach_begin/end instead of a plain for loop.
  * constify the pointers.

9 years agoTweak policies_log_first_redundant_entry more.
Nick Mathewson [Wed, 9 Dec 2015 16:02:10 +0000 (11:02 -0500)] 
Tweak policies_log_first_redundant_entry more.

   * Since the variable is no longer modified, it should be called
     'policy' instead of 'dest'.  ("Dest" is short for
     "destination".)
   * Fixed the space issue that dgoulet found on the ticket.
   * Fixed the comment a little. (We use the imperative for function
     documentation.)

9 years agoMerge remote-tracking branch 'teor/first-hop-no-private'
Nick Mathewson [Wed, 9 Dec 2015 15:47:59 +0000 (10:47 -0500)] 
Merge remote-tracking branch 'teor/first-hop-no-private'

9 years agochanges file for bug17791
Nick Mathewson [Wed, 9 Dec 2015 15:38:13 +0000 (10:38 -0500)] 
changes file for bug17791

9 years agoFix formatting typo in manpage.
Andrew Kvalheim [Wed, 9 Dec 2015 02:23:43 +0000 (18:23 -0800)] 
Fix formatting typo in manpage.

9 years agoMerge branch 'bug17776'
Nick Mathewson [Wed, 9 Dec 2015 15:31:14 +0000 (10:31 -0500)] 
Merge branch 'bug17776'

9 years agoAssert that the directory server digest is given
cypherpunks [Wed, 9 Dec 2015 12:12:45 +0000 (13:12 +0100)] 
Assert that the directory server digest is given

This prevents a possible crash when memory is copied from a pointer to
NULL.

9 years agoMention the expected length of the digests
cypherpunks [Wed, 9 Dec 2015 12:07:35 +0000 (13:07 +0100)] 
Mention the expected length of the digests

Some functions that use digest maps did not mention that the digests are
expected to have DIGEST_LEN bytes. This lead to buffer over-reads in the
past.

9 years agoAdd changes file for 17776
cypherpunks [Mon, 16 Nov 2015 14:12:44 +0000 (15:12 +0100)] 
Add changes file for 17776

9 years agoRemove unnecessary casting
cypherpunks [Wed, 11 Nov 2015 14:05:47 +0000 (15:05 +0100)] 
Remove unnecessary casting

9 years agoFix buffer over-reads in the rendcache tests
cypherpunks [Wed, 11 Nov 2015 13:47:35 +0000 (14:47 +0100)] 
Fix buffer over-reads in the rendcache tests

The hidden service descriptor cache (rendcache) tests use digest maps
which expect keys to have a length of DIGEST_LEN.

Because the tests use key strings with a length lower than DIGEST_LEN,
the internal copy operation reads outside the key strings which leads to
buffer over-reads.

The issue is resolved by using character arrays with a size of
DIGEST_LEN.

Patch on ade5005853c17b3ae5923c194680442e0f86db4d.

9 years agoFix buffer over-reads in the directory tests
cypherpunks [Wed, 11 Nov 2015 10:50:09 +0000 (11:50 +0100)] 
Fix buffer over-reads in the directory tests

The tests pass empty digest strings to the dir_server_new function which
copies it into a directory server structure. The copy operation expects
the digest strings to be DIGEST_LEN characters long.

Because the length of the empty digest strings are lower than
DIGEST_LEN, the copy operation reads outside the digest strings which
leads to buffer over-reads.

The issue is resolved by using character arrays with a size of
DIGEST_LEN.

Patch on 4ff08bb5811ddfe554e597d129ec48a774364480.

9 years agoTry to fix windows build
Nick Mathewson [Wed, 9 Dec 2015 13:59:01 +0000 (08:59 -0500)] 
Try to fix windows build

patch from rubiate on #16651

9 years agotry a little harder with getrandom types to avoid warnings
Nick Mathewson [Wed, 9 Dec 2015 13:31:29 +0000 (08:31 -0500)] 
try a little harder with getrandom types to avoid warnings

10 years agomark a variable unused.
Nick Mathewson [Tue, 8 Dec 2015 22:17:17 +0000 (17:17 -0500)] 
mark a variable unused.

10 years agoFix comment switcheroo. Spotted by skruffy
Nick Mathewson [Tue, 8 Dec 2015 17:53:51 +0000 (12:53 -0500)] 
Fix comment switcheroo. Spotted by skruffy

10 years agoFix spaces.
Nick Mathewson [Tue, 8 Dec 2015 17:37:36 +0000 (12:37 -0500)] 
Fix spaces.

10 years agoMerge branch 'feature13696_squashed'
Nick Mathewson [Tue, 8 Dec 2015 17:35:26 +0000 (12:35 -0500)] 
Merge branch 'feature13696_squashed'

10 years agoAdd support for getrandom() and getentropy() when available
Yawning Angel [Thu, 26 Nov 2015 15:21:50 +0000 (15:21 +0000)] 
Add support for getrandom() and getentropy() when available

Implements feature #13696.

10 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Tue, 8 Dec 2015 15:23:56 +0000 (10:23 -0500)] 
Merge branch 'maint-0.2.7'

10 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 8 Dec 2015 15:23:41 +0000 (10:23 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

10 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 8 Dec 2015 15:20:21 +0000 (10:20 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

10 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 8 Dec 2015 15:20:14 +0000 (10:20 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

10 years agoMerge branch 'bug17772_024' into maint-0.2.4
Nick Mathewson [Tue, 8 Dec 2015 15:18:31 +0000 (10:18 -0500)] 
Merge branch 'bug17772_024' into maint-0.2.4

10 years agoEnsure node is a guard candidate when picking a directory guard
Arlo Breault [Tue, 8 Dec 2015 04:28:26 +0000 (20:28 -0800)] 
Ensure node is a guard candidate when picking a directory guard

10 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Tue, 8 Dec 2015 14:44:01 +0000 (09:44 -0500)] 
Merge branch 'maint-0.2.7'

10 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Tue, 8 Dec 2015 14:43:42 +0000 (09:43 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

10 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 8 Dec 2015 14:43:25 +0000 (09:43 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

10 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 8 Dec 2015 14:38:48 +0000 (09:38 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

10 years agoFix a compilation warning introduced by clang 3.6
Nick Mathewson [Tue, 8 Dec 2015 14:37:05 +0000 (09:37 -0500)] 
Fix a compilation warning introduced by clang 3.6

There was a dead check when we made sure that an array member of a
struct was non-NULL.  Tor has been doing this check since at least
0.2.3, maybe earlier.

Fixes bug 17781.

10 years agoFix memory leak by circuit marked for close list
cypherpunks [Tue, 1 Dec 2015 12:34:31 +0000 (13:34 +0100)] 
Fix memory leak by circuit marked for close list

This commit fixes a memory leak introduced by commit
8b4e5b7ee902fb7fa07767410a18433d752c7aef.

10 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Tue, 8 Dec 2015 13:45:09 +0000 (08:45 -0500)] 
Merge branch 'maint-0.2.7'

10 years agoFormat IPv6 policies correctly.
Nick Mathewson [Tue, 8 Dec 2015 13:42:52 +0000 (08:42 -0500)] 
Format IPv6 policies correctly.

Previously we'd suppressed the mask-bits field in the output when
formatting a policy if it was >=32.  But that should be a >=128 if
we're talking about IPv6.

Since we didn't put these in descriptors, this bug affects only log
messages and controller outputs.

Fix for bug 16056.  The code in question was new in 0.2.0, but the
bug was introduced in 0.2.4 when we started supporting IPv6 exits.

10 years agoAdd changes file for 17778
cypherpunks [Mon, 16 Nov 2015 14:12:44 +0000 (15:12 +0100)] 
Add changes file for 17778

10 years agoFix memory leak in ntor test
cypherpunks [Mon, 16 Nov 2015 12:21:56 +0000 (13:21 +0100)] 
Fix memory leak in ntor test

10 years agoMerge remote-tracking branch 'teor/exitpolicy-multicast'
Nick Mathewson [Mon, 7 Dec 2015 15:23:30 +0000 (10:23 -0500)] 
Merge remote-tracking branch 'teor/exitpolicy-multicast'

10 years agoMerge remote-tracking branch 'teor/comments-20151204'
Nick Mathewson [Mon, 7 Dec 2015 15:13:20 +0000 (10:13 -0500)] 
Merge remote-tracking branch 'teor/comments-20151204'

10 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Mon, 7 Dec 2015 15:11:54 +0000 (10:11 -0500)] 
Merge branch 'maint-0.2.7'

10 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Mon, 7 Dec 2015 15:11:21 +0000 (10:11 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

10 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Mon, 7 Dec 2015 15:10:44 +0000 (10:10 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

10 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 7 Dec 2015 15:10:21 +0000 (10:10 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

10 years agoComment-only change to connection_get_by_type_addr_port_purpose
teor (Tim Wilson-Brown) [Mon, 7 Dec 2015 05:13:07 +0000 (16:13 +1100)] 
Comment-only change to connection_get_by_type_addr_port_purpose

connection_get_by_type_addr_port_purpose also ignores connections
that are marked for close.

10 years agoComment-only changes to connection_connect
teor (Tim Wilson-Brown) [Mon, 7 Dec 2015 04:59:34 +0000 (15:59 +1100)] 
Comment-only changes to connection_connect

port is in host order (addr is tor_addr_t, endianness is abstracted).

addr and port can be different to conn->addr and conn->port if
connecting via a proxy.

10 years agoMove a comment in router_get_my_descriptor to the correct line
teor (Tim Wilson-Brown) [Fri, 4 Dec 2015 07:13:29 +0000 (18:13 +1100)] 
Move a comment in router_get_my_descriptor to the correct line

10 years agoUpdate comment: get_connection_array no longer takes "n"
teor (Tim Wilson-Brown) [Tue, 1 Dec 2015 02:08:37 +0000 (13:08 +1100)] 
Update comment: get_connection_array no longer takes "n"

10 years agoConsistently ignore multicast in internal reject private exit policies
teor (Tim Wilson-Brown) [Mon, 7 Dec 2015 03:44:23 +0000 (14:44 +1100)] 
Consistently ignore multicast in internal reject private exit policies

Consistently ignore multicast addresses when automatically
generating reject private exit policies.

Closes ticket 17763. Bug fix on 10a6390deb3c9,
not in any released version of Tor. Patch by "teor".

10 years agoMake policies_log_first_redundant_entry take a const smartlist_t *
teor (Tim Wilson-Brown) [Sun, 6 Dec 2015 10:30:52 +0000 (21:30 +1100)] 
Make policies_log_first_redundant_entry take a const smartlist_t *

Also fixup code style.

10 years agoRefactor policies_parse_exit_policy_internal
teor (Tim Wilson-Brown) [Sun, 6 Dec 2015 10:28:21 +0000 (21:28 +1100)] 
Refactor policies_parse_exit_policy_internal

Move logging of redundant policy entries in
policies_parse_exit_policy_internal into its own function.

Closes ticket 17608; patch from "juce".

10 years agoUpdate geoip and geoip6 to the December 1 2015 database.
Karsten Loesing [Sat, 5 Dec 2015 16:02:59 +0000 (17:02 +0100)] 
Update geoip and geoip6 to the December 1 2015 database.

10 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Tue, 1 Dec 2015 03:03:00 +0000 (22:03 -0500)] 
Merge branch 'maint-0.2.7'

10 years agoAdd changes file for 17722
cypherpunks [Sun, 29 Nov 2015 20:07:34 +0000 (21:07 +0100)] 
Add changes file for 17722

10 years agoFix undefined behavior caused by memory overlap
cypherpunks [Fri, 17 Jul 2015 09:53:12 +0000 (11:53 +0200)] 
Fix undefined behavior caused by memory overlap

The tor_cert_get_checkable_sig function uses the signing key included in
the certificate (if available) when a separate public key is not given.

When the signature is valid, the tor_cert_checksig function copies the
public key from the checkable structure to the public key field of the
certificate signing key.

In situations where the separate public key is not given but the
certificate includes a signing key, the source and destination pointers
in the copy operation are equal and invoke undefined behavior.

Undefined behaviour is avoided by ensuring both pointers are different.

10 years agoAvoid relying on malloc internals in test_rend_cache_purge.
teor (Tim Wilson-Brown) [Mon, 30 Nov 2015 23:50:14 +0000 (10:50 +1100)] 
Avoid relying on malloc internals in test_rend_cache_purge.

Closes ticket 17724. Bug fix on ade5005853c1 and 5e9f2384cf0f,
not in any released version of Tor. Patch by "teor".

10 years agoMore fixes/debugging attempts for 17659
Nick Mathewson [Fri, 27 Nov 2015 17:54:57 +0000 (12:54 -0500)] 
More fixes/debugging attempts for 17659

10 years agoAdd a stack trace for help debugging one part of 17659
Nick Mathewson [Fri, 27 Nov 2015 17:11:51 +0000 (12:11 -0500)] 
Add a stack trace for help debugging one part of 17659

10 years agoMerge branch 'fix-policies-memory-v2-squashed'
Nick Mathewson [Fri, 27 Nov 2015 16:54:52 +0000 (11:54 -0500)] 
Merge branch 'fix-policies-memory-v2-squashed'

10 years agoFix memory leak in policies test
cypherpunks [Thu, 26 Nov 2015 18:03:44 +0000 (19:03 +0100)] 
Fix memory leak in policies test

10 years agoFix use-after-free of stack memory in getinfo_helper_policies
teor (Tim Wilson-Brown) [Thu, 26 Nov 2015 22:31:47 +0000 (09:31 +1100)] 
Fix use-after-free of stack memory in getinfo_helper_policies

10 years agoFix use-after-free of stack memory in policies_parse_exit_policy*
teor (Tim Wilson-Brown) [Thu, 26 Nov 2015 22:17:44 +0000 (09:17 +1100)] 
Fix use-after-free of stack memory in policies_parse_exit_policy*

Change the function names & comments to make the copying explicit.

10 years agouse sockaddr_storage for stack-allocated sockets in ersatz socketpair
Nick Mathewson [Fri, 27 Nov 2015 16:52:59 +0000 (11:52 -0500)] 
use sockaddr_storage for stack-allocated sockets in ersatz socketpair

10 years agoMake SIZEOF_SOCKADDR return socklen_t to avoid bad compares.
Nick Mathewson [Fri, 27 Nov 2015 16:48:54 +0000 (11:48 -0500)] 
Make SIZEOF_SOCKADDR return socklen_t to avoid bad compares.

10 years agoUse uint16_t, not in_port_t (which does not exist on Windows). See #17638.
Nick Mathewson [Fri, 27 Nov 2015 16:39:03 +0000 (11:39 -0500)] 
Use uint16_t, not in_port_t (which does not exist on Windows). See #17638.

10 years agoCheck magic number in connection_ap_attach_pending
Nick Mathewson [Fri, 27 Nov 2015 16:21:51 +0000 (11:21 -0500)] 
Check magic number in connection_ap_attach_pending

10 years agoimprove log messages to try to track down #17659
Nick Mathewson [Thu, 26 Nov 2015 17:44:12 +0000 (12:44 -0500)] 
improve log messages to try to track down #17659

10 years agoUnit test the full length of SHA256 and SHA512 digests
teor (Tim Wilson-Brown) [Thu, 26 Nov 2015 15:25:31 +0000 (02:25 +1100)] 
Unit test the full length of SHA256 and SHA512 digests

Bugfix on a tor version before the refactoring in git commit
cea12251995d (23 Sep 2009). Patch by "teor".

10 years agoMerge remote-tracking branch 'teor/rand-failure-modes-v2'
Nick Mathewson [Thu, 26 Nov 2015 15:05:38 +0000 (10:05 -0500)] 
Merge remote-tracking branch 'teor/rand-failure-modes-v2'

10 years agoFix buffer size in sha512 unit test
Nick Mathewson [Thu, 26 Nov 2015 15:00:12 +0000 (10:00 -0500)] 
Fix buffer size in sha512 unit test

Nobody likes a stack overflow, even in unit tests.

Closes 17699; but not in any released tor.

10 years agoFix test_tortls.c to no longer test failing crypto_rand.
Nick Mathewson [Thu, 26 Nov 2015 14:34:44 +0000 (09:34 -0500)] 
Fix test_tortls.c to no longer test failing crypto_rand.

(crypto_rand is no longer allowed to fail.)

Closes bug 17686; bug not in any released tor.  (No backport, since
the tortls tests aren't in 0.2.7)

10 years agoCorrectly free a smartlist in getinfo_helper_policies
teor (Tim Wilson-Brown) [Thu, 26 Nov 2015 14:11:25 +0000 (01:11 +1100)] 
Correctly free a smartlist in getinfo_helper_policies

10 years agoQuote variables in case they contain spaces
cypherpunks [Thu, 26 Nov 2015 12:18:40 +0000 (13:18 +0100)] 
Quote variables in case they contain spaces

10 years agoAdd unit tests that check for common RNG failure modes
teor (Tim Wilson-Brown) [Thu, 26 Nov 2015 10:25:31 +0000 (21:25 +1100)] 
Add unit tests that check for common RNG failure modes

Check that crypto_rand doesn't return all zeroes, identical values,
or incrementing values (OpenSSL's rand_predictable feature).

10 years agoMerge branch 'bug17686_v2_027'
Nick Mathewson [Thu, 26 Nov 2015 03:33:49 +0000 (22:33 -0500)] 
Merge branch 'bug17686_v2_027'

10 years agoAdd a changes file for bug 17686
Nick Mathewson [Wed, 25 Nov 2015 18:25:21 +0000 (13:25 -0500)] 
Add a changes file for bug 17686

10 years agoFix documentation for crypto_rand*
Nick Mathewson [Wed, 25 Nov 2015 17:28:20 +0000 (12:28 -0500)] 
Fix documentation for crypto_rand*

10 years agoNow that crypto_rand() cannot fail, it should return void.
Nick Mathewson [Wed, 25 Nov 2015 15:42:00 +0000 (10:42 -0500)] 
Now that crypto_rand() cannot fail, it should return void.

10 years agoAdd crypto-initializer functions to those whose return values must be checked
Nick Mathewson [Wed, 25 Nov 2015 15:36:34 +0000 (10:36 -0500)] 
Add crypto-initializer functions to those whose return values must be checked

10 years agoMake crypto_seed_rng() and crypto_rand() less scary.
Nick Mathewson [Wed, 25 Nov 2015 15:30:58 +0000 (10:30 -0500)] 
Make crypto_seed_rng() and crypto_rand() less scary.

These functions must really never fail; so have crypto_rand() assert
that it's working okay, and have crypto_seed_rng() demand that
callers check its return value.  Also have crypto_seed_rng() check
RAND_status() before returning.

10 years agoMerge remote-tracking branch 'teor/check-crypto-errors-v2'
Nick Mathewson [Thu, 26 Nov 2015 03:28:12 +0000 (22:28 -0500)] 
Merge remote-tracking branch 'teor/check-crypto-errors-v2'

10 years agofixup! Add controller getinfo exit-policy/reject-private
teor (Tim Wilson-Brown) [Sun, 22 Nov 2015 21:46:26 +0000 (08:46 +1100)] 
fixup! Add controller getinfo exit-policy/reject-private

Stop ignoring ExitPolicyRejectPrivate in getinfo
exit-policy/reject-private. Fix a memory leak.

Set ExitPolicyRejectPrivate in the unit tests, and make a mock
function declaration static.

10 years agoCheck the return value of HMAC in crypto.c and assert on error
teor (Tim Wilson-Brown) [Mon, 23 Nov 2015 09:53:59 +0000 (20:53 +1100)] 
Check the return value of HMAC in crypto.c and assert on error

Fixes bug #17658; bugfix on commit in fdbb9cdf746b (11 Oct 2011)
in tor version 0.2.3.5-alpha-dev.

10 years agoMerge branch 'bug17654_try1'
Nick Mathewson [Wed, 25 Nov 2015 17:25:44 +0000 (12:25 -0500)] 
Merge branch 'bug17654_try1'

10 years agoAttempt to make openbsd compilation happier with libevent2 installed
Nick Mathewson [Wed, 25 Nov 2015 14:43:12 +0000 (09:43 -0500)] 
Attempt to make openbsd compilation happier with libevent2 installed

Fix for bug 16651; patch from "rubiate".

10 years agoInitialize libevent before periodic events
cypherpunks [Wed, 25 Nov 2015 14:20:07 +0000 (15:20 +0100)] 
Initialize libevent before periodic events

The initialization of libevent interferes with other tests so we also
fork the circuit_timeout test.

10 years agofixup! Block OutboundBindAddressIPv[4|6]_ and configured ports on exit relays
teor (Tim Wilson-Brown) [Sun, 22 Nov 2015 21:38:32 +0000 (08:38 +1100)] 
fixup! Block OutboundBindAddressIPv[4|6]_ and configured ports on exit relays

Fix unit tests for get_interface_address6_list to assume less
about the interface addresses on the system.

Instead, mock get_interface_address6_list and use the mocked
function to provide a range of address combinations.

10 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Wed, 25 Nov 2015 14:28:44 +0000 (09:28 -0500)] 
Merge branch 'maint-0.2.7'

10 years agoInclude netinet/in.h (if detected) in check for net/pfvar.h
Nick Mathewson [Wed, 25 Nov 2015 14:27:52 +0000 (09:27 -0500)] 
Include netinet/in.h (if detected) in check for net/pfvar.h

Patch from rubiate; fixes bug 17551.

10 years agoMerge remote-tracking branch 'public/decouple_dir_request_failed'
Nick Mathewson [Wed, 25 Nov 2015 14:21:25 +0000 (09:21 -0500)] 
Merge remote-tracking branch 'public/decouple_dir_request_failed'

10 years agoFix a logic error in connection_tls_continue_handshake().
Nick Mathewson [Wed, 25 Nov 2015 14:12:50 +0000 (09:12 -0500)] 
Fix a logic error in connection_tls_continue_handshake().

(If we take the branch above this assertion, than we *didn't* have a
v1 handshake.  So if we don't take the branch, we did.  So if we
reach this assertion, we must be running as a server, since clients
no longer attempt v1 handshakes.)

Fix for bug 17654; bugfix on 9d019a7db725dca3dfdbf8d4dbc3b51835e0b49e.

Bug not in any released Tor.

10 years agoMerge remote-tracking branch 'teor/comments-20151123'
Nick Mathewson [Wed, 25 Nov 2015 14:08:15 +0000 (09:08 -0500)] 
Merge remote-tracking branch 'teor/comments-20151123'

10 years agoMerge remote-tracking branch 'atagar/man_page_fixes'
Nick Mathewson [Wed, 25 Nov 2015 14:07:02 +0000 (09:07 -0500)] 
Merge remote-tracking branch 'atagar/man_page_fixes'

10 years agoTweak gtank's sha512 patch a little
Nick Mathewson [Wed, 25 Nov 2015 14:04:17 +0000 (09:04 -0500)] 
Tweak gtank's sha512 patch a little

10 years agoMerge remote-tracking branch 'gtank/feature17663'
Nick Mathewson [Wed, 25 Nov 2015 14:00:01 +0000 (09:00 -0500)] 
Merge remote-tracking branch 'gtank/feature17663'

10 years agoMerge remote-tracking branch 'teor/feature8961-replaycache-sha256'
Nick Mathewson [Wed, 25 Nov 2015 13:55:18 +0000 (08:55 -0500)] 
Merge remote-tracking branch 'teor/feature8961-replaycache-sha256'

10 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Wed, 25 Nov 2015 13:53:46 +0000 (08:53 -0500)] 
Merge branch 'maint-0.2.7'

10 years agofixup! Refuse to make direct connections to private OR addresses
teor (Tim Wilson-Brown) [Tue, 24 Nov 2015 20:54:18 +0000 (07:54 +1100)] 
fixup! Refuse to make direct connections to private OR addresses

Add changes file.

10 years agoRefuse to make direct connections to private OR addresses
teor (Tim Wilson-Brown) [Tue, 24 Nov 2015 16:11:15 +0000 (03:11 +1100)] 
Refuse to make direct connections to private OR addresses

Refuse connection requests to private OR addresses unless
ExtendAllowPrivateAddresses is set. Previously, tor would
connect, then refuse to send any cells to a private address.

Fixes bugs 17674 and 8976; bugfix on b7c172c9ec76 (28 Aug 2012)
Original bug 6710, released in 0.2.3.21-rc and an 0.2.2 maint
release.

Patch by "teor".

10 years agoFixes for tor's man page
Damian Johnson [Tue, 24 Nov 2015 02:29:19 +0000 (18:29 -0800)] 
Fixes for tor's man page

I'm adding Stem test coverage for tor's man page and in doing so ran into quite
a few issues. All of them are pretty minor (worst was misnaming a couple config
options), but still good things to fix. :P

10 years agoDrop HidServDirectoryV2 and VoteOnHidServDirectoriesV2
Damian Johnson [Tue, 24 Nov 2015 02:27:17 +0000 (18:27 -0800)] 
Drop HidServDirectoryV2 and VoteOnHidServDirectoriesV2

These options were removed from tor in July. Time to axe them from our man
page. :P

  https://gitweb.torproject.org/tor.git/commit/?id=2f8cf524ba4e565ab613504a4c41fd724d32facc