]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoMerge branch 'ticket23820_032_01_squashed' into maint-0.3.2
Nick Mathewson [Thu, 2 Nov 2017 14:19:29 +0000 (10:19 -0400)] 
Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2

8 years agoChanges file for 23820
teor [Thu, 26 Oct 2017 06:25:16 +0000 (17:25 +1100)] 
Changes file for 23820

8 years agoDon't run IPv6-only v3 single onion service tests using chutney
teor [Thu, 26 Oct 2017 05:51:04 +0000 (16:51 +1100)] 
Don't run IPv6-only v3 single onion service tests using chutney

Part of #23820.

8 years agoStop users configuring IPv6-only v3 single onion services
teor [Thu, 26 Oct 2017 05:49:00 +0000 (16:49 +1100)] 
Stop users configuring IPv6-only v3 single onion services

They are not yet implemented: they will upload descriptors, but won't be
able to rendezvous, because IPv6 addresses in link specifiers are ignored.

Part of #23820.

8 years agoImprove v3 onion service logging for intro and rend points
teor [Thu, 26 Oct 2017 05:48:02 +0000 (16:48 +1100)] 
Improve v3 onion service logging for intro and rend points

Diagnostics for #23820.

8 years agoRemove buggy IPv6 and ed25519 handling from get_lspecs_from_extend_info()
teor [Thu, 26 Oct 2017 05:30:24 +0000 (16:30 +1100)] 
Remove buggy IPv6 and ed25519 handling from get_lspecs_from_extend_info()

The previous version of this function had the following issues:
* it didn't check if the extend_info contained an IPv6 address,
* it didn't check if the ed25519 identity key was valid.
But we can't add IPv6 support in a bugfix release.

Instead, BUG() if the address is an IPv6 address, so we always put IPv4
addresses in link specifiers. And ignore missing ed25519 identifiers,
rather than generating an all-zero link specifier.

This supports v3 hidden services on IPv4, dual-stack, and IPv6, and
v3 single onion services on IPv4 only.

Part of 23820, bugfix on 0.3.2.1-alpha.

8 years agoman: Specify HiddenServiceNumIntroductionPoints for v3
David Goulet [Wed, 1 Nov 2017 16:35:14 +0000 (12:35 -0400)] 
man: Specify HiddenServiceNumIntroductionPoints for v3

A v3 service can have between 0 and 20 intro points where v2 has 0 to 10.

Fixes #24115

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'bug24082_032' into maint-0.3.2
Nick Mathewson [Tue, 31 Oct 2017 18:31:21 +0000 (14:31 -0400)] 
Merge branch 'bug24082_032' into maint-0.3.2

8 years agodouble newline
Nick Mathewson [Tue, 31 Oct 2017 18:18:48 +0000 (14:18 -0400)] 
double newline

8 years agoMerge branch 'hsdescv3_fuzz_more' into maint-0.3.2
Nick Mathewson [Tue, 31 Oct 2017 18:04:31 +0000 (14:04 -0400)] 
Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2

8 years agomake 23762 changes file pass check-changes
Nick Mathewson [Tue, 31 Oct 2017 16:19:39 +0000 (12:19 -0400)] 
make 23762 changes file pass check-changes

8 years agoMerge branch 'bug23762_032_02_squashed' into maint-0.3.2
Nick Mathewson [Tue, 31 Oct 2017 16:14:21 +0000 (12:14 -0400)] 
Merge branch 'bug23762_032_02_squashed' into maint-0.3.2

8 years agohs-v3: Attempt descriptor refetch when dirinfo changes
David Goulet [Wed, 4 Oct 2017 20:22:49 +0000 (16:22 -0400)] 
hs-v3: Attempt descriptor refetch when dirinfo changes

When the directory information changes, callback to the HS client subsystem so
it can check if any pending SOCKS connections are waiting for a descriptor. If
yes, attempt a refetch for those.

Fixes #23762

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 31 Oct 2017 15:43:14 +0000 (11:43 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 31 Oct 2017 15:43:14 +0000 (11:43 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 31 Oct 2017 15:43:14 +0000 (11:43 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
Nick Mathewson [Tue, 31 Oct 2017 15:43:07 +0000 (11:43 -0400)] 
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9

8 years agoInitialize the mock options in the fuzzing code
Nick Mathewson [Mon, 30 Oct 2017 21:05:26 +0000 (17:05 -0400)] 
Initialize the mock options in the fuzzing code

Fixes bug 24082; bugfix on 0.3.0.3-alpha.  Found by Brian Carpenter.

8 years agoMerge remote-tracking branch 'public/bug23774_032' into maint-0.3.2
Nick Mathewson [Mon, 30 Oct 2017 15:07:26 +0000 (11:07 -0400)] 
Merge remote-tracking branch 'public/bug23774_032' into maint-0.3.2

8 years agoIn the hsdescv3 fuzzer, replace the decryption function.
Nick Mathewson [Fri, 27 Oct 2017 18:28:02 +0000 (14:28 -0400)] 
In the hsdescv3 fuzzer, replace the decryption function.

The new decryption function performs no decryption, skips the salt,
and doesn't check the mac.  This allows us to fuzz the
hs_descriptor.c code using unencrypted descriptor test, and exercise
more of the code.

Related to 21509.

8 years agobump to 0.3.2.3-alpha-dev.
Nick Mathewson [Fri, 27 Oct 2017 16:33:13 +0000 (12:33 -0400)] 
bump to 0.3.2.3-alpha-dev.

8 years agoupdate to 0.3.2.3-alpha
Nick Mathewson [Fri, 27 Oct 2017 12:59:07 +0000 (08:59 -0400)] 
update to 0.3.2.3-alpha

8 years agohs-v3: Check the ed25519 key when picking intro point
David Goulet [Thu, 26 Oct 2017 18:54:20 +0000 (14:54 -0400)] 
hs-v3: Check the ed25519 key when picking intro point

If the intro point supports ed25519 link authentication, make sure we don't
have a zeroed key which would lead to a failure to extend to it.

We already check for an empty key if the intro point does not support it so
this makes the check on the key more consistent and symmetric.

Fixes #24002

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agofuzzing: Make hsdescv3 use the decoding API correctly
David Goulet [Thu, 26 Oct 2017 13:52:15 +0000 (09:52 -0400)] 
fuzzing: Make hsdescv3 use the decoding API correctly

Fixes #21509

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoRevert "Temporarily disable compilation of the v3 hs fuzzing code"
David Goulet [Thu, 26 Oct 2017 13:41:47 +0000 (09:41 -0400)] 
Revert "Temporarily disable compilation of the v3 hs fuzzing code"

This reverts commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403.

8 years agofix check-changes warning
Nick Mathewson [Thu, 26 Oct 2017 13:08:49 +0000 (09:08 -0400)] 
fix check-changes warning

8 years agoAdd changes file for #23862.
George Kadianakis [Wed, 25 Oct 2017 16:54:48 +0000 (19:54 +0300)] 
Add changes file for #23862.

8 years agoRemove a duplicate call to update_microdesc_downloads()
George Kadianakis [Wed, 25 Oct 2017 16:18:38 +0000 (19:18 +0300)] 
Remove a duplicate call to update_microdesc_downloads()

This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.

8 years agoUpdate entry guard state whenever we download a consensus.
George Kadianakis [Wed, 25 Oct 2017 16:18:25 +0000 (19:18 +0300)] 
Update entry guard state whenever we download a consensus.

Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.

Fixes #23862 on 0.3.0.1-alpha

8 years agoRemove buggy IPv6 support from pick_intro_point() and service_intro_point_new()
teor [Thu, 26 Oct 2017 03:47:54 +0000 (14:47 +1100)] 
Remove buggy IPv6 support from pick_intro_point() and service_intro_point_new()

The previous version of these functions had the following issues:
* they can't supply both the IPv4 and IPv6 addresses in link specifiers,
* they try to fall back to a 3-hop path when the address for a direct
  connection is unreachable, but this isn't supported by
  launch_rendezvous_point_circuit(), so it fails.
But we can't fix these things in a bugfix release.

Instead, always put IPv4 addresses in link specifiers.
And if a v3 single onion service can't reach any intro points, fail.

This supports v3 hidden services on IPv4, dual-stack, and IPv6, and
v3 single onion services on IPv4 only.

Part of 23820, bugfix on 0.3.2.1-alpha.

8 years agoRemove buggy IPv6 support from hs_get_extend_info_from_lspecs()
teor [Thu, 26 Oct 2017 03:38:06 +0000 (14:38 +1100)] 
Remove buggy IPv6 support from hs_get_extend_info_from_lspecs()

The previous version of this function has the following issues:
* it doesn't choose between IPv4 and IPv6 addresses correctly, and
* it doesn't fall back to a 3-hop path when the address for a direct
  connection is unreachable.
But we can't fix these things in a bugfix release.

Instead, treat IPv6 addresses like any other unrecognised link specifier
and ignore them. If there is no IPv4 address, return NULL.

This supports v3 hidden services on IPv4, dual-stack, and IPv6, and
v3 single onion services on IPv4 only.

Part of 23820, bugfix on 0.3.2.1-alpha.

8 years agohs-v2: Copy needed information between service on prunning
David Goulet [Wed, 25 Oct 2017 15:21:28 +0000 (11:21 -0400)] 
hs-v2: Copy needed information between service on prunning

Turns out that when reloading a tor configured with hidden service(s), we
weren't copying all the needed information between the old service object to
the new one.

For instance, the desc_is_dirty timestamp wasn't which could lead to the
service uploading its desriptor much later than it would need to.

The replaycache wasn't also moved over and some intro point information as
well.

Fixes #23790

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 25 Oct 2017 13:28:57 +0000 (09:28 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid version bump

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

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 25 Oct 2017 13:28:41 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 25 Oct 2017 13:28:29 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Wed, 25 Oct 2017 13:28:15 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump

8 years agobump to 0.3.1.8-dev
Nick Mathewson [Wed, 25 Oct 2017 13:28:05 +0000 (09:28 -0400)] 
bump to 0.3.1.8-dev

8 years agobump to 0.3.0.12-dev
Nick Mathewson [Wed, 25 Oct 2017 13:27:50 +0000 (09:27 -0400)] 
bump to 0.3.0.12-dev

8 years agobump to 0.2.9.13-dev
Nick Mathewson [Wed, 25 Oct 2017 13:27:23 +0000 (09:27 -0400)] 
bump to 0.2.9.13-dev

8 years agobump to 0.2.8.16-dev
Nick Mathewson [Wed, 25 Oct 2017 13:27:07 +0000 (09:27 -0400)] 
bump to 0.2.8.16-dev

8 years agobump to 0.2.5.15-dev
Nick Mathewson [Wed, 25 Oct 2017 13:26:53 +0000 (09:26 -0400)] 
bump to 0.2.5.15-dev

8 years agoMerge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2
Nick Mathewson [Tue, 24 Oct 2017 23:41:26 +0000 (19:41 -0400)] 
Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2

8 years agoMerge branch 'feature18329_029_squashed' into maint-0.3.2
Nick Mathewson [Tue, 24 Oct 2017 23:35:32 +0000 (19:35 -0400)] 
Merge branch 'feature18329_029_squashed' into maint-0.3.2

8 years agoMerge branch 'feature18329_029_squashed' into maint-0.3.2
Nick Mathewson [Tue, 24 Oct 2017 23:35:28 +0000 (19:35 -0400)] 
Merge branch 'feature18329_029_squashed' into maint-0.3.2

8 years agoUpdates to fix check-spaces/check-changes warnings
Nick Mathewson [Tue, 24 Oct 2017 23:35:16 +0000 (19:35 -0400)] 
Updates to fix check-spaces/check-changes warnings

8 years agoAdjust test to allow hyphens too.
Nick Mathewson [Tue, 24 Oct 2017 23:33:38 +0000 (19:33 -0400)] 
Adjust test to allow hyphens too.

8 years agotest: Add unittest for descriptors with BridgeDistribution option.
Isis Lovecruft [Mon, 23 Oct 2017 19:44:06 +0000 (19:44 +0000)] 
test: Add unittest for descriptors with BridgeDistribution option.

8 years agodoc: Improve documentation for check_bridge_distribution_setting().
Isis Lovecruft [Mon, 23 Oct 2017 19:37:52 +0000 (19:37 +0000)] 
doc: Improve documentation for check_bridge_distribution_setting().

8 years agoAlways set bridge-distribution-request on bridges' descriptors.
Nick Mathewson [Mon, 23 Oct 2017 14:52:42 +0000 (10:52 -0400)] 
Always set bridge-distribution-request on bridges' descriptors.

Also, warn the user if the BridgeDistribution option is
unrecognized, and reject the value if it is invalid.

8 years agoTweak the documentation for BridgeDistribution
Nick Mathewson [Mon, 23 Oct 2017 14:38:19 +0000 (10:38 -0400)] 
Tweak the documentation for BridgeDistribution

Note that it will have no effect yet; note that the default is
"any".

8 years agoAdd new BridgeDistribution config option
Roger Dingledine [Sun, 13 Nov 2016 07:39:16 +0000 (02:39 -0500)] 
Add new BridgeDistribution config option

Bridge relays can use it to add a "bridge-distribution-request" line
to their bridge descriptor, which tells BridgeDB how they'd like their
bridge address to be given out.

Implements tickets 18329.

8 years agoRewrite bridge addresses earlier
Taylor Yu [Thu, 28 Sep 2017 22:15:47 +0000 (17:15 -0500)] 
Rewrite bridge addresses earlier

Call rewrite_node_address_for_bridge() in
launch_direct_bridge_descriptor_fetch() in case there's an existing
node_t for it.

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 24 Oct 2017 13:11:38 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 24 Oct 2017 13:11:33 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 24 Oct 2017 13:11:24 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump

8 years agobump version in the other places :/
Nick Mathewson [Tue, 24 Oct 2017 13:11:17 +0000 (09:11 -0400)] 
bump version in the other places :/

8 years agobump version in the other places :/
Nick Mathewson [Tue, 24 Oct 2017 13:11:07 +0000 (09:11 -0400)] 
bump version in the other places :/

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 24 Oct 2017 13:10:37 +0000 (09:10 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 24 Oct 2017 13:10:30 +0000 (09:10 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 24 Oct 2017 13:10:24 +0000 (09:10 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Tue, 24 Oct 2017 13:10:17 +0000 (09:10 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Tue, 24 Oct 2017 13:10:04 +0000 (09:10 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump

8 years agobump to 0.3.1.8
Nick Mathewson [Tue, 24 Oct 2017 13:09:50 +0000 (09:09 -0400)] 
bump to 0.3.1.8

8 years agobump to 0.3.0.12
Nick Mathewson [Tue, 24 Oct 2017 13:09:35 +0000 (09:09 -0400)] 
bump to 0.3.0.12

8 years agobump to 0.2.9.13
Nick Mathewson [Tue, 24 Oct 2017 13:09:26 +0000 (09:09 -0400)] 
bump to 0.2.9.13

8 years agobump to 0.2.8.16
Nick Mathewson [Tue, 24 Oct 2017 13:09:10 +0000 (09:09 -0400)] 
bump to 0.2.8.16

8 years agobump to 0.2.5.15
Nick Mathewson [Tue, 24 Oct 2017 13:09:00 +0000 (09:09 -0400)] 
bump to 0.2.5.15

8 years agoMerge branch 'bug23952_032' into maint-0.3.2
Nick Mathewson [Tue, 24 Oct 2017 12:24:12 +0000 (08:24 -0400)] 
Merge branch 'bug23952_032' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 19:55:48 +0000 (15:55 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 23 Oct 2017 19:55:48 +0000 (15:55 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 19:55:08 +0000 (15:55 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 19:53:45 +0000 (15:53 -0400)] 
Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

8 years agoHave LOG_PROTOCOL_WARN call its own function
Nick Mathewson [Mon, 23 Oct 2017 16:20:58 +0000 (12:20 -0400)] 
Have LOG_PROTOCOL_WARN call its own function

Also, make the function that implements LOG_PROTOCOL_WARN use a
cached value of the desired loglevel, rather than calling
get_options().

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 23 Oct 2017 13:22:43 +0000 (09:22 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9

8 years agoRemove the length limit from write_http_status_line
Nick Mathewson [Mon, 23 Oct 2017 13:21:22 +0000 (09:21 -0400)] 
Remove the length limit from write_http_status_line

Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin
failure message really long.

Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d,
where arma said "get rid of the scary 256-byte-buf landmine".

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 13:11:10 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 13:11:10 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 23 Oct 2017 13:11:10 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 13:11:10 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoAdjust test, now that there are 9 dirauths again
Nick Mathewson [Mon, 23 Oct 2017 13:11:07 +0000 (09:11 -0400)] 
Adjust test, now that there are 9 dirauths again

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 13:06:34 +0000 (09:06 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 13:06:34 +0000 (09:06 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 23 Oct 2017 13:06:34 +0000 (09:06 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 13:06:34 +0000 (09:06 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Mon, 23 Oct 2017 13:04:56 +0000 (09:04 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agodirauth: Add bastet to the default authorities
David Goulet [Thu, 19 Oct 2017 20:08:43 +0000 (16:08 -0400)] 
dirauth: Add bastet to the default authorities

Fixes #23910

Based on a patch by dgoulet; backported to 0.2.5

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 12:59:11 +0000 (08:59 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 12:59:11 +0000 (08:59 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 23 Oct 2017 12:59:11 +0000 (08:59 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 12:59:11 +0000 (08:59 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Mon, 23 Oct 2017 12:58:28 +0000 (08:58 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Mon, 23 Oct 2017 12:53:25 +0000 (08:53 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 12:53:25 +0000 (08:53 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 23 Oct 2017 12:53:25 +0000 (08:53 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 12:53:25 +0000 (08:53 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
Nick Mathewson [Mon, 23 Oct 2017 12:53:14 +0000 (08:53 -0400)] 
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 23 Oct 2017 12:47:59 +0000 (08:47 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 23 Oct 2017 12:47:58 +0000 (08:47 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 23 Oct 2017 12:47:58 +0000 (08:47 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1