]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agochanges file for 22804
Nick Mathewson [Wed, 5 Jul 2017 14:01:40 +0000 (10:01 -0400)] 
changes file for 22804

8 years agoCREATE_FAST is for when you don't know the onion key
Roger Dingledine [Mon, 3 Jul 2017 21:16:26 +0000 (17:16 -0400)] 
CREATE_FAST is for when you don't know the onion key

it isn't (anymore) for when you think you can get away with saving some
crypto operations.

8 years agobetter comments and mild refactoring
Roger Dingledine [Mon, 3 Jul 2017 21:13:08 +0000 (17:13 -0400)] 
better comments and mild refactoring

8 years agoDocument the new functions from the refactor
Nick Mathewson [Mon, 3 Jul 2017 20:23:23 +0000 (16:23 -0400)] 
Document the new functions from the refactor

8 years agoReindent the functions split from circuit_send_next_onion_skin().
Nick Mathewson [Mon, 3 Jul 2017 20:16:26 +0000 (16:16 -0400)] 
Reindent the functions split from circuit_send_next_onion_skin().

This is a whitespace change only.

8 years agoSplit circuit_send_next_onion_skin() into its three main cases.
Nick Mathewson [Mon, 3 Jul 2017 20:14:48 +0000 (16:14 -0400)] 
Split circuit_send_next_onion_skin() into its three main cases.

This commit is designed to have a very small diff.  Therefore,
the indentation is wrong.  The next commit will fix that.

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Mon, 3 Jul 2017 17:26:38 +0000 (13:26 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoUpdate fuzzing_include_am to include updates from include.am
Nick Mathewson [Mon, 3 Jul 2017 17:24:57 +0000 (13:24 -0400)] 
Update fuzzing_include_am to include updates from include.am

8 years agogeneral formatting / whitespace / typo fixes
Roger Dingledine [Sat, 1 Jul 2017 21:56:06 +0000 (17:56 -0400)] 
general formatting / whitespace / typo fixes

8 years agoAdd 0.3.1.4-alpha to changelog
Nick Mathewson [Thu, 29 Jun 2017 22:48:06 +0000 (18:48 -0400)] 
Add 0.3.1.4-alpha to changelog

8 years agoAdd 0.3.0.9 to changelog and releasenotes
Nick Mathewson [Thu, 29 Jun 2017 22:47:24 +0000 (18:47 -0400)] 
Add 0.3.0.9 to changelog and releasenotes

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 29 Jun 2017 22:45:57 +0000 (18:45 -0400)] 
Merge branch 'maint-0.3.1'

"ours" merge to avoid version bump.

8 years agoBump version to 0.3.1.4-alpha-dev
Nick Mathewson [Thu, 29 Jun 2017 22:45:49 +0000 (18:45 -0400)] 
Bump version to 0.3.1.4-alpha-dev

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 29 Jun 2017 22:44:53 +0000 (18:44 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump.

8 years agobump to 0.3.0.9-dev
Nick Mathewson [Thu, 29 Jun 2017 22:44:43 +0000 (18:44 -0400)] 
bump to 0.3.0.9-dev

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 29 Jun 2017 20:36:58 +0000 (16:36 -0400)] 
Merge branch 'maint-0.3.1'

"ours" merge to avoid version bump.

8 years agoBump 0.3.1 to 0.3.1.4-alpha
Nick Mathewson [Thu, 29 Jun 2017 20:36:50 +0000 (16:36 -0400)] 
Bump 0.3.1 to 0.3.1.4-alpha

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 29 Jun 2017 20:36:05 +0000 (16:36 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump.

8 years agoUpdate maint-0.3.0 to 0.3.0.9
Nick Mathewson [Thu, 29 Jun 2017 20:35:40 +0000 (16:35 -0400)] 
Update maint-0.3.0 to 0.3.0.9

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 29 Jun 2017 19:57:49 +0000 (15:57 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 29 Jun 2017 19:57:48 +0000 (15:57 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'trove-2017-006' into maint-0.3.0
Nick Mathewson [Thu, 29 Jun 2017 19:57:42 +0000 (15:57 -0400)] 
Merge branch 'trove-2017-006' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 29 Jun 2017 15:38:06 +0000 (11:38 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge remote-tracking branch 'public/bug22670_031' into maint-0.3.1
Nick Mathewson [Thu, 29 Jun 2017 15:34:06 +0000 (11:34 -0400)] 
Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 29 Jun 2017 14:43:50 +0000 (10:43 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'ticket22684'
Nick Mathewson [Thu, 29 Jun 2017 14:16:15 +0000 (10:16 -0400)] 
Merge branch 'ticket22684'

8 years agoAdjust unit tests to account for fix to bug 22753.
Nick Mathewson [Thu, 29 Jun 2017 14:09:06 +0000 (10:09 -0400)] 
Adjust unit tests to account for fix to bug 22753.

Our mock network put all the guards on the same IPv4 address, which
doesn't fly when we start applying EnforceDistinctSubnets.  So in
this commit, I disable EnforceDistinctSubnets when running the old
guard_restriction_t test.

This commit also adds a regression test for #22753.

8 years agoConsider the exit family when applying guard restrictions.
Nick Mathewson [Wed, 28 Jun 2017 15:41:50 +0000 (11:41 -0400)] 
Consider the exit family when applying guard restrictions.

When the new path selection logic went into place, I accidentally
dropped the code that considered the _family_ of the exit node when
deciding if the guard was usable, and we didn't catch that during
code review.

This patch makes the guard_restriction_t code consider the exit
family as well, and adds some (hopefully redundant) checks for the
case where we lack a node_t for a guard but we have a bridge_info_t
for it.

Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016-006
and CVE-2017-0377.

8 years agoChanges file for bug22752 diagnostics
Nick Mathewson [Wed, 28 Jun 2017 18:27:52 +0000 (14:27 -0400)] 
Changes file for bug22752 diagnostics

8 years agoLog real error message when unable to remove a storagedir file
Nick Mathewson [Wed, 28 Jun 2017 18:24:27 +0000 (14:24 -0400)] 
Log real error message when unable to remove a storagedir file

Attempts to help diagnose 22752.

8 years agoReplace crash on missing handle in consdiffmgr with nonfatal assert
Nick Mathewson [Wed, 28 Jun 2017 18:21:21 +0000 (14:21 -0400)] 
Replace crash on missing handle in consdiffmgr with nonfatal assert

Attempts to mitigate 22752.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 28 Jun 2017 18:03:23 +0000 (14:03 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 28 Jun 2017 18:03:23 +0000 (14:03 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 28 Jun 2017 18:03:23 +0000 (14:03 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
Nick Mathewson [Wed, 28 Jun 2017 18:03:20 +0000 (14:03 -0400)] 
Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 28 Jun 2017 17:58:37 +0000 (13:58 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 28 Jun 2017 17:58:37 +0000 (13:58 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 28 Jun 2017 17:58:37 +0000 (13:58 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9
Nick Mathewson [Wed, 28 Jun 2017 17:57:54 +0000 (13:57 -0400)] 
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 28 Jun 2017 17:54:12 +0000 (13:54 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 28 Jun 2017 17:54:00 +0000 (13:54 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid taking redundant ws fix

8 years agowhitespace fix
Nick Mathewson [Wed, 28 Jun 2017 17:53:52 +0000 (13:53 -0400)] 
whitespace fix

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 28 Jun 2017 17:49:28 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 28 Jun 2017 17:49:14 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"Ours" merge to avoid taking backport of 21969

8 years agoMerge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0
Nick Mathewson [Wed, 28 Jun 2017 17:48:52 +0000 (13:48 -0400)] 
Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 28 Jun 2017 16:25:09 +0000 (12:25 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoFix crash in LZMA module when the Sandbox is enabled.
Alexander Færøy [Wed, 28 Jun 2017 13:57:58 +0000 (09:57 -0400)] 
Fix crash in LZMA module when the Sandbox is enabled.

This patch fixes a crash in our LZMA module where liblzma will allocate
slightly more data than it is allowed to by its limit, which leads to a
crash.

See: https://bugs.torproject.org/22751

8 years agoed25519: Add changes file for #22746.
George Kadianakis [Wed, 28 Jun 2017 13:09:46 +0000 (16:09 +0300)] 
ed25519: Add changes file for #22746.

8 years agoed25519: Add tests blinding bad ed25519 pubkeys.
George Kadianakis [Wed, 28 Jun 2017 13:02:21 +0000 (16:02 +0300)] 
ed25519: Add tests blinding bad ed25519 pubkeys.

8 years agoed25519: Also check that retval in the ref10 implementation.
George Kadianakis [Wed, 28 Jun 2017 11:12:20 +0000 (14:12 +0300)] 
ed25519: Also check that retval in the ref10 implementation.

8 years agoed25519: Check retval of unpack_negative_vartime in donna.
George Kadianakis [Wed, 28 Jun 2017 11:10:10 +0000 (14:10 +0300)] 
ed25519: Check retval of unpack_negative_vartime in donna.

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Tue, 27 Jun 2017 22:28:38 +0000 (18:28 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'ahf_bugs_22702_squashed' into maint-0.3.1
Nick Mathewson [Tue, 27 Jun 2017 22:28:34 +0000 (18:28 -0400)] 
Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1

8 years agoAdd changes file for bug #22702.
Alexander Færøy [Tue, 27 Jun 2017 22:21:43 +0000 (22:21 +0000)] 
Add changes file for bug #22702.

See: https://bugs.torproject.org/22702

8 years agoReturn "304 not modified" if a client already have the most recent consensus.
Alexander Færøy [Tue, 27 Jun 2017 17:16:44 +0000 (17:16 +0000)] 
Return "304 not modified" if a client already have the most recent consensus.

This makes our directory code check if a client is trying to fetch a
document that matches a digest from our latest consensus document.

See: https://bugs.torproject.org/22702

8 years agoSet published_out for consensus cache entries in spooled_resource_estimate_size().
Alexander Færøy [Fri, 23 Jun 2017 23:55:54 +0000 (23:55 +0000)] 
Set published_out for consensus cache entries in spooled_resource_estimate_size().

This patch ensures that the published_out output parameter is set to the
current consensus cache entry's "valid after" field.

See: https://bugs.torproject.org/22702

8 years agoMerge branch 'asn_bug22006_final_squashed'
Nick Mathewson [Tue, 27 Jun 2017 22:21:46 +0000 (18:21 -0400)] 
Merge branch 'asn_bug22006_final_squashed'

8 years agono newlines in log messages.
Nick Mathewson [Tue, 27 Jun 2017 22:21:35 +0000 (18:21 -0400)] 
no newlines in log messages.

8 years agowhitespace fix
Nick Mathewson [Tue, 27 Jun 2017 21:22:53 +0000 (17:22 -0400)] 
whitespace fix

8 years agoMerge branch 'asn_bug22006_final_squashed'
Nick Mathewson [Tue, 27 Jun 2017 21:19:08 +0000 (17:19 -0400)] 
Merge branch 'asn_bug22006_final_squashed'

8 years agoed25519: Dirauths validate router ed25519 pubkeys before pinning.
George Kadianakis [Tue, 27 Jun 2017 12:53:00 +0000 (15:53 +0300)] 
ed25519: Dirauths validate router ed25519 pubkeys before pinning.

8 years agoed25519: Add unittests for ed25519 pubkey validation.
George Kadianakis [Tue, 25 Apr 2017 12:20:13 +0000 (15:20 +0300)] 
ed25519: Add unittests for ed25519 pubkey validation.

8 years agoed25519: Add func that checks for torsion component in pubkeys.
George Kadianakis [Tue, 25 Apr 2017 12:19:41 +0000 (15:19 +0300)] 
ed25519: Add func that checks for torsion component in pubkeys.

See https://lists.torproject.org/pipermail/tor-dev/2017-April/012213.html .

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'bug22737_024' into maint-0.2.4
Nick Mathewson [Tue, 27 Jun 2017 15:04:41 +0000 (11:04 -0400)] 
Merge branch 'bug22737_024' into maint-0.2.4

8 years agoFix an errant memset() into the middle of a struct in cell_pack().
Nick Mathewson [Tue, 27 Jun 2017 14:45:29 +0000 (10:45 -0400)] 
Fix an errant memset() into the middle of a struct in cell_pack().

This mistake causes two possible bugs. I believe they are both
harmless IRL.

BUG 1: memory stomping

When we call the memset, we are overwriting two 0 bytes past the end
of packed_cell_t.body. But I think that's harmless in practice,
because the definition of packed_cell_t is:

// ...
typedef struct packed_cell_t {
  TOR_SIMPLEQ_ENTRY(packed_cell_t) next;
  char body[CELL_MAX_NETWORK_SIZE];
  uint32_t inserted_time;
} packed_cell_t;

So we will overwrite either two bytes of inserted_time, or two bytes
of padding, depending on how the platform handles alignment.

If we're overwriting padding, that's safe.

If we are overwriting the inserted_time field, that's also safe: In
every case where we call cell_pack() from connection_or.c, we ignore
the inserted_time field. When we call cell_pack() from relay.c, we
don't set or use inserted_time until right after we have called
cell_pack(). SO I believe we're safe in that case too.

BUG 2: memory exposure

The original reason for this memset was to avoid the possibility of
accidentally leaking uninitialized ram to the network. Now
remember, if wide_circ_ids is false on a connection, we shouldn't
actually be sending more than 512 bytes of packed_cell_t.body, so
these two bytes can only leak to the network if there is another bug
somewhere else in the code that sends more data than is correct.

Fortunately, in relay.c, where we allocate packed_cell_t in
packed_cell_new() , we allocate it with tor_malloc_zero(), which
clears the RAM, right before we call cell_pack. So those
packed_cell_t.body bytes can't leak any information.

That leaves the two calls to cell_pack() in connection_or.c, which
use stack-alocated packed_cell_t instances.

In or_handshake_state_record_cell(), we pass the cell's contents to
crypto_digest_add_bytes(). When we do so, we get the number of
bytes to pass using the same setting of wide_circ_ids as we passed
to cell_pack(). So I believe that's safe.

In connection_or_write_cell_to_buf(), we also use the same setting
of wide_circ_ids in both calls. So I believe that's safe too.

I introduced this bug with 1c0e87f6d8c7a0abdadf1b5cd9082c10abc7f4e2
back in 0.2.4.11-alpha; it is bug 22737 and CID 1401591

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Tue, 27 Jun 2017 14:32:50 +0000 (10:32 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'bug22719_031' into maint-0.3.1
Nick Mathewson [Tue, 27 Jun 2017 14:31:33 +0000 (10:31 -0400)] 
Merge branch 'bug22719_031' into maint-0.3.1

8 years agochanges file for bug 22719
Nick Mathewson [Tue, 27 Jun 2017 14:31:03 +0000 (10:31 -0400)] 
changes file for bug 22719

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Mon, 26 Jun 2017 18:30:21 +0000 (14:30 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'bug22105_031' into maint-0.3.1
Nick Mathewson [Mon, 26 Jun 2017 18:30:17 +0000 (14:30 -0400)] 
Merge branch 'bug22105_031' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Mon, 26 Jun 2017 18:15:21 +0000 (14:15 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoPatch for 22720 from huyvq: exit(1) more often
Nick Mathewson [Mon, 26 Jun 2017 18:14:56 +0000 (14:14 -0400)] 
Patch for 22720 from huyvq: exit(1) more often

See changes file for full details.

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Mon, 26 Jun 2017 15:39:43 +0000 (11:39 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'bug22212_squashed' into maint-0.3.1
Nick Mathewson [Mon, 26 Jun 2017 15:27:09 +0000 (11:27 -0400)] 
Merge branch 'bug22212_squashed' into maint-0.3.1

8 years agoChanges file for Bug 22212.
Mike Perry [Fri, 23 Jun 2017 23:10:20 +0000 (19:10 -0400)] 
Changes file for Bug 22212.

8 years agoDemote a log message due to libevent delays.
Mike Perry [Wed, 21 Jun 2017 20:30:53 +0000 (16:30 -0400)] 
Demote a log message due to libevent delays.

This is a side-effect of being single-threaded. The worst cases of this are
actually Bug #16585.

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Mon, 26 Jun 2017 14:32:57 +0000 (10:32 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoFix a coverity warning about a no-op assert with-64 bit size_t
Nick Mathewson [Mon, 26 Jun 2017 14:31:13 +0000 (10:31 -0400)] 
Fix a coverity warning about a no-op assert with-64 bit size_t

This is CID 1403400

8 years agoTry a little harder to make sure we never call tor_compress_process wrong.
Nick Mathewson [Mon, 26 Jun 2017 13:39:59 +0000 (09:39 -0400)] 
Try a little harder to make sure we never call tor_compress_process wrong.

8 years agoLog even more to try to debug 22719
Nick Mathewson [Sat, 24 Jun 2017 17:40:02 +0000 (13:40 -0400)] 
Log even more to try to debug 22719

8 years agoAdd an additional log message to try to diagnose #22719
Nick Mathewson [Sat, 24 Jun 2017 15:27:46 +0000 (11:27 -0400)] 
Add an additional log message to try to diagnose #22719

8 years agoMerge remote-tracking branch 'isis/bug4019'
Nick Mathewson [Fri, 23 Jun 2017 18:38:20 +0000 (14:38 -0400)] 
Merge remote-tracking branch 'isis/bug4019'

8 years agoAdd changes file for bug4019.
Isis Lovecruft [Fri, 23 Jun 2017 18:31:16 +0000 (18:31 +0000)] 
Add changes file for bug4019.

8 years agoMerge branch 'bug3056_squashed'
Nick Mathewson [Fri, 23 Jun 2017 13:28:27 +0000 (09:28 -0400)] 
Merge branch 'bug3056_squashed'

8 years agoImprove clarity, safety, and rate of dns spoofing log msg
Nick Mathewson [Wed, 24 May 2017 14:32:38 +0000 (10:32 -0400)] 
Improve clarity, safety, and rate of dns spoofing log msg

Closes ticket 3056.

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 22 Jun 2017 14:56:08 +0000 (10:56 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 22 Jun 2017 14:56:08 +0000 (10:56 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoCombine our "don't do this if no consensus" entryguards checks
Nick Mathewson [Thu, 22 Jun 2017 13:28:30 +0000 (09:28 -0400)] 
Combine our "don't do this if no consensus" entryguards checks

Suggested by asn on 22400 review.

8 years agoexpand changes file for bug 22461
Nick Mathewson [Thu, 22 Jun 2017 12:16:56 +0000 (08:16 -0400)] 
expand changes file for bug 22461

8 years agowhitespace fix
Nick Mathewson [Thu, 22 Jun 2017 12:16:48 +0000 (08:16 -0400)] 
whitespace fix

8 years agoMerge remote-tracking branch 'rl1987/bug22461'
Nick Mathewson [Thu, 22 Jun 2017 12:11:36 +0000 (08:11 -0400)] 
Merge remote-tracking branch 'rl1987/bug22461'

8 years agoMerge remote-tracking branch 'public/bug7890'
Nick Mathewson [Thu, 22 Jun 2017 12:04:12 +0000 (08:04 -0400)] 
Merge remote-tracking branch 'public/bug7890'