]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoAdd tests for tor_addr_parse, separate from tor_addr_port_parse.
David Fifield [Wed, 2 Aug 2017 09:04:35 +0000 (02:04 -0700)] 
Add tests for tor_addr_parse, separate from tor_addr_port_parse.

7 years agoImprove bracket handling in tor_addr_parse()
rl1987 [Fri, 31 Aug 2018 15:55:36 +0000 (18:55 +0300)] 
Improve bracket handling in tor_addr_parse()

* Actually check for second bracket
* Only attempt parsing IPv4 address when no brackets found

7 years agoChange mention of is_extrainfo router_parse_list_from_string() to want_extrainfo
Neel Chauhan [Thu, 30 Aug 2018 01:05:24 +0000 (21:05 -0400)] 
Change mention of is_extrainfo router_parse_list_from_string() to want_extrainfo

7 years agoMerge branch 'ticket27246_035_01_squashed'
Nick Mathewson [Wed, 29 Aug 2018 19:05:05 +0000 (15:05 -0400)] 
Merge branch 'ticket27246_035_01_squashed'

7 years agoExpand the comments on ASN.1-encoded TAP keys
Nick Mathewson [Wed, 29 Aug 2018 19:04:54 +0000 (15:04 -0400)] 
Expand the comments on ASN.1-encoded TAP keys

7 years agoChanges for 27246
Nick Mathewson [Wed, 29 Aug 2018 19:02:59 +0000 (15:02 -0400)] 
Changes for 27246

7 years agorouter: Keep RSA onion public key in ASN.1 format
David Goulet [Thu, 23 Aug 2018 18:05:42 +0000 (14:05 -0400)] 
router: Keep RSA onion public key in ASN.1 format

The OpenSSL "RSA" object is currently 408 bytes compares to the ASN.1 encoding
which is 140 for a 1024 RSA key.

We save 268 bytes per descriptor (routerinfo_t) *and* microdescriptor
(microdesc_t). Scaling this to 6000 relays, and considering client usually
only have microdescriptors, we save 1.608 MB of RAM which is considerable for
mobile client.

This commit makes it that we keep the RSA onion public key (used for TAP
handshake) in ASN.1 format instead of an OpenSSL RSA object.

Changes is done in both routerinfo_t and microdesc_t.

Closes #27246

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'onionk/prototest1'
Nick Mathewson [Wed, 29 Aug 2018 01:32:46 +0000 (21:32 -0400)] 
Merge remote-tracking branch 'onionk/prototest1'

7 years agoTest: avoid spurious failures in make test-network-all
teor [Fri, 24 Aug 2018 00:25:25 +0000 (10:25 +1000)] 
Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.

7 years agoTest: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
teor [Fri, 24 Aug 2018 00:20:30 +0000 (10:20 +1000)] 
Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.

7 years agofix man page issue noticed during #26367 review
Roger Dingledine [Tue, 28 Aug 2018 20:28:45 +0000 (16:28 -0400)] 
fix man page issue noticed during #26367 review

and fix two other nearby issues while i'm there

7 years agoSet the file encoding in checkIncludes.py with Python3
Nick Mathewson [Tue, 28 Aug 2018 20:25:15 +0000 (16:25 -0400)] 
Set the file encoding in checkIncludes.py with Python3

7 years agomake a comment more right
Roger Dingledine [Tue, 28 Aug 2018 20:13:58 +0000 (16:13 -0400)] 
make a comment more right

(from #20874 fix)

7 years agoMerge remote-tracking branch 'teor/bug22747'
Nick Mathewson [Tue, 28 Aug 2018 20:12:01 +0000 (16:12 -0400)] 
Merge remote-tracking branch 'teor/bug22747'

7 years agoMerge remote-tracking branch 'onionk/connection-comments1'
Nick Mathewson [Tue, 28 Aug 2018 20:07:46 +0000 (16:07 -0400)] 
Merge remote-tracking branch 'onionk/connection-comments1'

7 years agoMerge branch 'bug26367_035_01'
Nick Mathewson [Tue, 28 Aug 2018 20:02:04 +0000 (16:02 -0400)] 
Merge branch 'bug26367_035_01'

7 years agohs: Remove rend_client_non_anonymous_mode_enabled
David Goulet [Thu, 12 Jul 2018 13:23:57 +0000 (09:23 -0400)] 
hs: Remove rend_client_non_anonymous_mode_enabled

The removal of Tor2Web made this function useless.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agohs: Remove rend_client_allow_non_anonymous_connection
David Goulet [Thu, 12 Jul 2018 13:21:52 +0000 (09:21 -0400)] 
hs: Remove rend_client_allow_non_anonymous_connection

By removing Tor2Web, there is no way a client can be non anonymous so we
remove that function and the callsites.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agocirc: Remove useless param from cannibalization function
David Goulet [Mon, 9 Jul 2018 20:13:34 +0000 (16:13 -0400)] 
circ: Remove useless param from cannibalization function

Because we just removed Tor2web support, the need_specific_rp is not needed
anymore when cannibalizing a circuit.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agohs: Render obsolete Tor2web
David Goulet [Mon, 9 Jul 2018 20:11:39 +0000 (16:11 -0400)] 
hs: Render obsolete Tor2web

Remove support for Tor2web in the code and build system. At this commit, tor
doesn't have Tor2web support anymore.

Ref: https://lists.torproject.org/pipermail/tor-dev/2018-July/013295.html

Close #26367

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge remote-tracking branch 'dgoulet/ticket27215_035_01'
Nick Mathewson [Tue, 28 Aug 2018 20:00:45 +0000 (16:00 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket27215_035_01'

7 years agofixup! hs: Change default version from 2 to 3
David Goulet [Tue, 28 Aug 2018 19:58:28 +0000 (15:58 -0400)] 
fixup! hs: Change default version from 2 to 3

7 years agoFix log.c comments about assert vs tor_assert vs raw_assert.
Nick Mathewson [Tue, 28 Aug 2018 19:58:16 +0000 (15:58 -0400)] 
Fix log.c comments about assert vs tor_assert vs raw_assert.

7 years agoMerge remote-tracking branch 'tor-github/pr/245'
Nick Mathewson [Tue, 28 Aug 2018 19:44:06 +0000 (15:44 -0400)] 
Merge remote-tracking branch 'tor-github/pr/245'

7 years agoMerge remote-tracking branch 'tor-github/pr/279'
Nick Mathewson [Tue, 28 Aug 2018 19:24:30 +0000 (15:24 -0400)] 
Merge remote-tracking branch 'tor-github/pr/279'

7 years agoMerge branch 'bug26896_034'
Nick Mathewson [Tue, 28 Aug 2018 16:35:50 +0000 (12:35 -0400)] 
Merge branch 'bug26896_034'

7 years agofixup! hs: Learn service version by trying to load the keys
David Goulet [Tue, 28 Aug 2018 12:36:28 +0000 (08:36 -0400)] 
fixup! hs: Learn service version by trying to load the keys

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 27 Aug 2018 13:39:08 +0000 (09:39 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 27 Aug 2018 13:39:08 +0000 (09:39 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 27 Aug 2018 13:39:08 +0000 (09:39 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoWhen running make test-network-all, use the mixed+hs-v2 network
teor [Mon, 27 Aug 2018 13:06:04 +0000 (23:06 +1000)] 
When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.

7 years agocore/mainloop: more comments documenting connection.c
cypherpunks [Mon, 27 Aug 2018 01:32:34 +0000 (01:32 +0000)] 
core/mainloop: more comments documenting connection.c

7 years agocore/mainloop: fix documentation of connection_handle_write_impl()
cypherpunks [Mon, 27 Aug 2018 01:07:01 +0000 (01:07 +0000)] 
core/mainloop: fix documentation of connection_handle_write_impl()

Inaccurate since ​d9746bd468f551d1ada57d962b20eddd15256ce9.

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 24 Aug 2018 20:50:24 +0000 (16:50 -0400)] 
Merge branch 'maint-0.3.4'

"ours" to avoid version bump.

7 years agoForward-port changelog from 0.3.4.7-rc
Nick Mathewson [Fri, 24 Aug 2018 20:50:12 +0000 (16:50 -0400)] 
Forward-port changelog from 0.3.4.7-rc

7 years agoUpdate to 0.3.4.7-rc-dev
Nick Mathewson [Fri, 24 Aug 2018 20:49:56 +0000 (16:49 -0400)] 
Update to 0.3.4.7-rc-dev

7 years agoFix a compilation warning on i386 with clang
Nick Mathewson [Fri, 24 Aug 2018 20:13:30 +0000 (16:13 -0400)] 
Fix a compilation warning on i386 with clang

7 years agoMerge remote-tracking branch 'tor-github/pr/289'
Nick Mathewson [Fri, 24 Aug 2018 16:57:18 +0000 (12:57 -0400)] 
Merge remote-tracking branch 'tor-github/pr/289'

7 years agoMerge remote-tracking branch 'teor/ticket27211'
Nick Mathewson [Fri, 24 Aug 2018 16:45:42 +0000 (12:45 -0400)] 
Merge remote-tracking branch 'teor/ticket27211'

7 years agoMerge remote-tracking branch 'teor/bug27237'
Nick Mathewson [Fri, 24 Aug 2018 16:44:46 +0000 (12:44 -0400)] 
Merge remote-tracking branch 'teor/bug27237'

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 24 Aug 2018 16:35:26 +0000 (12:35 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 24 Aug 2018 16:33:20 +0000 (12:33 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 24 Aug 2018 16:32:10 +0000 (12:32 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'ticket27286_032_v2' into maint-0.3.2
Nick Mathewson [Fri, 24 Aug 2018 16:32:06 +0000 (12:32 -0400)] 
Merge branch 'ticket27286_032_v2' into maint-0.3.2

7 years agoUpdate the protocol versions recommendations to remove LinkAuth=1
Nick Mathewson [Thu, 23 Aug 2018 15:24:39 +0000 (11:24 -0400)] 
Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 24 Aug 2018 16:05:39 +0000 (12:05 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoBootstrap: add some extra logging
teor [Fri, 24 Aug 2018 15:11:44 +0000 (01:11 +1000)] 
Bootstrap: add some extra logging

Diagnostics for 27236.

7 years agoBootstrap: allow internal-only onion service networks to bootstrap
teor [Fri, 24 Aug 2018 15:08:53 +0000 (01:08 +1000)] 
Bootstrap: allow internal-only onion service networks to bootstrap

This fix requires chutney's 27230 fix to bridge client bootstrap.

Part of 27236.

7 years agoRemove changes entries for stuff that is already in maint-0.3.4
Nick Mathewson [Fri, 24 Aug 2018 13:15:34 +0000 (09:15 -0400)] 
Remove changes entries for stuff that is already in maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 24 Aug 2018 13:13:37 +0000 (09:13 -0400)] 
Merge branch 'maint-0.3.4'

"ours" merge to avoid version bump.

7 years agoBump to 0.3.4.7-rc
Nick Mathewson [Fri, 24 Aug 2018 13:13:20 +0000 (09:13 -0400)] 
Bump to 0.3.4.7-rc

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 24 Aug 2018 12:32:33 +0000 (08:32 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoBootstrap: try harder to get descriptors in non-exit test networks
teor [Fri, 24 Aug 2018 01:59:47 +0000 (11:59 +1000)] 
Bootstrap: try harder to get descriptors in non-exit test networks

Use the mid weight for the third hop when there are no exits.

Fixes bug 27237; bugfix on 0.2.6.2-alpha.

7 years agoAdd scripts/test/chutney-git-bisect.sh, for bisecting using chutney
teor [Thu, 23 Aug 2018 18:03:56 +0000 (04:03 +1000)] 
Add scripts/test/chutney-git-bisect.sh, for bisecting using chutney

Supports bisection on 0.3.4 and earlier.
Recommend that users copy the script before bisecting.

Implements ticket 27211.

7 years agoBootstrap: stop requiring descriptors to count exits as usable
teor [Fri, 24 Aug 2018 01:55:41 +0000 (11:55 +1000)] 
Bootstrap: stop requiring descriptors to count exits as usable

Instead, count exits as usable if they have the exit flag, and
present if they also have a non-reject exit policy.

Requiring a threshold of usable descriptors avoids directories trickling
exit descriptors to clients to discover their ExitNodes settings.

Part of 27236.

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 24 Aug 2018 00:44:16 +0000 (20:44 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4
Nick Mathewson [Fri, 24 Aug 2018 00:44:06 +0000 (20:44 -0400)] 
Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4

7 years agoAppveyor CI: always use HEAD for the short commit
teor [Tue, 31 Jul 2018 02:14:40 +0000 (12:14 +1000)] 
Appveyor CI: always use HEAD for the short commit

Part of 26979.

7 years agoAppveyor CI: Changes file for 26979
teor [Tue, 31 Jul 2018 01:58:04 +0000 (11:58 +1000)] 
Appveyor CI: Changes file for 26979

Closes 26979.

7 years agoAppveyor CI: sort environmental variables
teor [Tue, 31 Jul 2018 01:54:02 +0000 (11:54 +1000)] 
Appveyor CI: sort environmental variables

To avoid future duplicates.

7 years agoAppveyor CI: fix some typos
teor [Tue, 31 Jul 2018 01:49:11 +0000 (11:49 +1000)] 
Appveyor CI: fix some typos

7 years agoAppveyor CI: Generate correct tag names
teor [Tue, 31 Jul 2018 01:47:33 +0000 (11:47 +1000)] 
Appveyor CI: Generate correct tag names

Part of 26979.

7 years agoAppveyor CI: Switch to one URL per line
teor [Tue, 31 Jul 2018 01:37:11 +0000 (11:37 +1000)] 
Appveyor CI: Switch to one URL per line

Part of 26979.

7 years agoAppveyor CI: Generate correct branches and URLs for pull requests
teor [Tue, 31 Jul 2018 01:12:21 +0000 (11:12 +1000)] 
Appveyor CI: Generate correct branches and URLs for pull requests

Part of 26979.

7 years agoAppveyor CI: Make short commits 10 hexdigits long
teor [Tue, 31 Jul 2018 01:10:55 +0000 (11:10 +1000)] 
Appveyor CI: Make short commits 10 hexdigits long

That's what git does for tor.

Part of 26979.

7 years agoAppveyor CI: Fix GitHub provider detection
teor [Tue, 31 Jul 2018 01:09:54 +0000 (11:09 +1000)] 
Appveyor CI: Fix GitHub provider detection

Part of 26979.

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 24 Aug 2018 00:07:47 +0000 (20:07 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
Nick Mathewson [Fri, 24 Aug 2018 00:07:39 +0000 (20:07 -0400)] 
Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4

7 years agoCI: Only post Appveyor IRC notifications when the build fails
teor [Wed, 22 Aug 2018 23:39:36 +0000 (09:39 +1000)] 
CI: Only post Appveyor IRC notifications when the build fails

Implements 27275.

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Thu, 23 Aug 2018 23:37:32 +0000 (19:37 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 23 Aug 2018 23:36:45 +0000 (19:36 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoSilence a compilation warning on MSVC 2017 and clang-cl
teor [Thu, 23 Aug 2018 08:55:39 +0000 (18:55 +1000)] 
Silence a compilation warning on MSVC 2017 and clang-cl

test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().

Fixes bug 27185; bugfix on 0.2.2.2-alpha.

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Thu, 23 Aug 2018 18:26:04 +0000 (14:26 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4
Nick Mathewson [Thu, 23 Aug 2018 18:22:30 +0000 (14:22 -0400)] 
Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4

7 years agoBootstrap: check the exit policy and flag on descriptors
teor [Thu, 23 Aug 2018 14:10:52 +0000 (00:10 +1000)] 
Bootstrap: check the exit policy and flag on descriptors

Previously, Tor would only check the exit flag. In small networks, Tor
could bootstrap once it received a consensus with exits, without fetching
the new descriptors for those exits.

After bootstrap, Tor delays descriptor fetches, leading to failures in
fast networks like chutney.

Fixes 27236; bugfix on 0.2.6.3-alpha.

7 years agoUpdate the message logged on relays when DirCache is disabled
teor [Thu, 23 Aug 2018 09:10:39 +0000 (19:10 +1000)] 
Update the message logged on relays when DirCache is disabled

Since 0.3.3.5-rc, authorities require DirCache (V2Dir) for the Guard
flag.

Fixes bug 24312; bugfix on 0.3.3.5-rc.

7 years agoChange the wording of the DirCache warning
Dominique Ingoglia [Sat, 10 Feb 2018 21:33:14 +0000 (14:33 -0700)] 
Change the wording of the DirCache warning

7 years agohs: Change default version from 2 to 3
David Goulet [Wed, 22 Aug 2018 15:42:23 +0000 (11:42 -0400)] 
hs: Change default version from 2 to 3

Closes #27215

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agohs: Learn service version by trying to load the keys
David Goulet [Wed, 22 Aug 2018 15:38:28 +0000 (11:38 -0400)] 
hs: Learn service version by trying to load the keys

In order to switch the default HS version from 2 to 3, we need tor to be smart
and be able to decide on the version by trying to load the service keys during
configuration validation.

Part of #27215

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agokey: Make ed_key_init_from_file() take an or_options_t
David Goulet [Wed, 22 Aug 2018 15:32:57 +0000 (11:32 -0400)] 
key: Make ed_key_init_from_file() take an or_options_t

Part of #27215, we need to call the ed_key_init_from_file function during
option_validate() which is before the global_options variable is set.

This commit make ed_key_init_from_file() stop using get_options() and instead
now has a or_options_t parameter.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoFix revision counter bugs caused by bad SRV start time computation.
George Kadianakis [Fri, 17 Aug 2018 12:10:20 +0000 (15:10 +0300)] 
Fix revision counter bugs caused by bad SRV start time computation.

Bug description: For each descriptor, its revision counter is the OPE
ciphertext of the number of seconds since the start time of its SRV value.
This bug caused us to confuse the SRV start time in the middle of the lifetime
of a descriptor in some edge-cases, which caused descriptor rejects.

Bug cause: The bug occurs when we fetch a 23:00 consensus after
midnight (e.g. at 00:08 when not all dirauths have fetched the latest 00:00
consensus). In that case, the voting schedule (which was used for SRV start
time calculation) would return a valid-after past-midnight, whereas our
consensus would be pre-midnight, and that would confuse the SRV start time
computation which is used by HS revision counters (because we would reset the
start time of SRV, without rotating descriptors).

Bug fix: We now use our local consensus time to calculate the SRV start time,
instead of the voting schedule. The voting schedule does not work as originally
envisioned in this case, because it was created for voting by dirauths and not
for scheduling stuff on clients.

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 22 Aug 2018 13:37:31 +0000 (09:37 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMark cert_matches_key as not-intrusive; fix stretch compilation.
Nick Mathewson [Wed, 22 Aug 2018 13:37:26 +0000 (09:37 -0400)] 
Mark cert_matches_key as not-intrusive; fix stretch compilation.

7 years agoMerge remote-tracking branch 'tor-github/pr/287'
Nick Mathewson [Wed, 22 Aug 2018 00:08:55 +0000 (20:08 -0400)] 
Merge remote-tracking branch 'tor-github/pr/287'

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 00:04:17 +0000 (20:04 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 22 Aug 2018 00:04:17 +0000 (20:04 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Wed, 22 Aug 2018 00:04:17 +0000 (20:04 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'teor/travis-osx-master'
Nick Mathewson [Wed, 22 Aug 2018 00:04:13 +0000 (20:04 -0400)] 
Merge remote-tracking branch 'teor/travis-osx-master'

7 years agoMerge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
Nick Mathewson [Wed, 22 Aug 2018 00:04:03 +0000 (20:04 -0400)] 
Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4

7 years agoMerge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
Nick Mathewson [Wed, 22 Aug 2018 00:03:56 +0000 (20:03 -0400)] 
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 22 Aug 2018 00:03:46 +0000 (20:03 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2