]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoMake crypto_strongest_rand() non-mockable
Nick Mathewson [Tue, 18 Sep 2018 16:40:18 +0000 (12:40 -0400)] 
Make crypto_strongest_rand() non-mockable

Instead, have it call a mockable function.  We don't want
crypto_strongest_rand() to be mockable, since doing so creates a
type error when we call it from ed25519-donna, which we do not build
in a test mode.

Fixes bug 27728; bugfix on 0.3.5.1-alpha

7 years agoMerge remote-tracking branch 'tor-github/pr/352'
Nick Mathewson [Tue, 18 Sep 2018 12:44:58 +0000 (08:44 -0400)] 
Merge remote-tracking branch 'tor-github/pr/352'

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Tue, 18 Sep 2018 12:33:13 +0000 (08:33 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 18 Sep 2018 12:31:14 +0000 (08:31 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3
Nick Mathewson [Tue, 18 Sep 2018 12:31:08 +0000 (08:31 -0400)] 
Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3

7 years agoMerge remote-tracking branch 'github/bug27073_029'
Nick Mathewson [Tue, 18 Sep 2018 12:16:42 +0000 (08:16 -0400)] 
Merge remote-tracking branch 'github/bug27073_029'

7 years agoMerge remote-tracking branch 'tor-github/pr/344'
Nick Mathewson [Tue, 18 Sep 2018 12:15:02 +0000 (08:15 -0400)] 
Merge remote-tracking branch 'tor-github/pr/344'

7 years agoChanges file for 27764
Nick Mathewson [Tue, 18 Sep 2018 12:12:46 +0000 (08:12 -0400)] 
Changes file for 27764

7 years agoMerge remote-tracking branch 'asn-github/bug27764'
Nick Mathewson [Tue, 18 Sep 2018 12:10:25 +0000 (08:10 -0400)] 
Merge remote-tracking branch 'asn-github/bug27764'

7 years agoBump to 0.3.5.1-alpha-dev
Nick Mathewson [Tue, 18 Sep 2018 11:52:27 +0000 (07:52 -0400)] 
Bump to 0.3.5.1-alpha-dev

7 years agoFix minor memleak in edge-case of crypto_rsa.c function.
George Kadianakis [Tue, 18 Sep 2018 11:01:15 +0000 (14:01 +0300)] 
Fix minor memleak in edge-case of crypto_rsa.c function.

7 years agoMerge remote-tracking branch 'teor/ticket27757' tor-0.3.5.1-alpha
Nick Mathewson [Tue, 18 Sep 2018 01:43:34 +0000 (21:43 -0400)] 
Merge remote-tracking branch 'teor/ticket27757'

7 years agoChangeLog: add onion service versions to the Tor2web deprecation notice
teor [Tue, 18 Sep 2018 01:34:58 +0000 (11:34 +1000)] 
ChangeLog: add onion service versions to the Tor2web deprecation notice

Tor2web was never implemented for v3 onion services.

7 years agoChangeLog: the ContactInfo UTF-8 requirement is a major UI change
teor [Tue, 18 Sep 2018 01:29:43 +0000 (11:29 +1000)] 
ChangeLog: the ContactInfo UTF-8 requirement is a major UI change

(Even if it only affects a few relay operators.)

7 years agoChangeLog: bugfixes are on previous releases, not this release
teor [Tue, 18 Sep 2018 00:57:33 +0000 (10:57 +1000)] 
ChangeLog: bugfixes are on previous releases, not this release

7 years agoChangeLog: delete both consensus flavours to un-break nss
teor [Tue, 18 Sep 2018 00:42:59 +0000 (10:42 +1000)] 
ChangeLog: delete both consensus flavours to un-break nss

The required protocol version check occurs before the consensus flavour
check. So on directory mirrors (and some client configs), alpha users need
to delete both consensus flavours to workaround nss bugs.

Closes ticket 27756.

7 years agoMerge branch 'bug23512-v4-033' into bug23512-v4-master
Mike Perry [Tue, 18 Sep 2018 00:17:14 +0000 (00:17 +0000)] 
Merge branch 'bug23512-v4-033' into bug23512-v4-master

7 years agoBug 23512: Test fix: cmux is now allocated by new_fake_channel()
Mike Perry [Fri, 14 Sep 2018 20:45:21 +0000 (20:45 +0000)] 
Bug 23512: Test fix: cmux is now allocated by new_fake_channel()

7 years agoMerge branch 'bug23512-v4-032' into bug23512-v4-033
Mike Perry [Mon, 17 Sep 2018 23:31:34 +0000 (23:31 +0000)] 
Merge branch 'bug23512-v4-032' into bug23512-v4-033

7 years agoRemove duplicate TLS define from kist code.
Mike Perry [Mon, 17 Sep 2018 22:08:45 +0000 (22:08 +0000)] 
Remove duplicate TLS define from kist code.

Duplicate comes from introducing this define into 0.2.9, which did not yet
have KIST.

7 years agoBug 23512: Mock assert_circuit_ok in tests.
Mike Perry [Fri, 14 Sep 2018 20:28:47 +0000 (20:28 +0000)] 
Bug 23512: Mock assert_circuit_ok in tests.

This mocking was not available in 0.2.9.

7 years agoMerge branch 'bug23512-v4-029' into bug23512-v4-032
Mike Perry [Mon, 17 Sep 2018 23:12:45 +0000 (23:12 +0000)] 
Merge branch 'bug23512-v4-029' into bug23512-v4-032

7 years agoBug 23512: Test recording bytes in circ queues.
Mike Perry [Thu, 13 Sep 2018 23:03:32 +0000 (23:03 +0000)] 
Bug 23512: Test recording bytes in circ queues.

7 years agoBug 23512: Changes file.
Mike Perry [Thu, 13 Sep 2018 19:19:03 +0000 (19:19 +0000)] 
Bug 23512: Changes file.

7 years agoBug 23512: Report queued cells on or circs as written.
Mike Perry [Fri, 14 Sep 2018 18:50:40 +0000 (18:50 +0000)] 
Bug 23512: Report queued cells on or circs as written.

This avoids asymmetry in our public relay stats, which can be exploited for
guard discovery and other attacks.

7 years agoPromote rep_hist bw functions to uint64_t.
Mike Perry [Fri, 14 Sep 2018 18:35:44 +0000 (18:35 +0000)] 
Promote rep_hist bw functions to uint64_t.

The rest of rephist uses uint64_t internally. Let's make these take it too,
so we don't have to worry about overflowing size_t on 32 bit systems.

7 years agoMore changelog edits
Nick Mathewson [Mon, 17 Sep 2018 20:35:13 +0000 (16:35 -0400)] 
More changelog edits

7 years agoWrite a blurb, pull UI changes to the front, edit
Nick Mathewson [Mon, 17 Sep 2018 20:04:30 +0000 (16:04 -0400)] 
Write a blurb, pull UI changes to the front, edit

7 years agoLight edits on changelog. mostly combining sections.
Nick Mathewson [Mon, 17 Sep 2018 19:37:35 +0000 (15:37 -0400)] 
Light edits on changelog. mostly combining sections.

7 years agoLower the maximum size of a private key file to 16 MB
Nick Mathewson [Mon, 17 Sep 2018 15:08:56 +0000 (11:08 -0400)] 
Lower the maximum size of a private key file to 16 MB

This shouldn't be a user-visible change: nobody has a 16 MB RSA
key that they're trying to use with Tor.

I'm doing this to fix CID 1439330 / ticket 27730, where coverity
complains (on 64-bit) that we are making a comparison that is never
true.

7 years agoBump to 0.3.5.1-alpha
Nick Mathewson [Mon, 17 Sep 2018 13:12:42 +0000 (09:12 -0400)] 
Bump to 0.3.5.1-alpha

7 years agoStart a changelog for 0.3.5.1-alpha
Nick Mathewson [Mon, 17 Sep 2018 13:10:18 +0000 (09:10 -0400)] 
Start a changelog for 0.3.5.1-alpha

7 years agoAdd tortls.h includes to expose critical macro. Fix #27734.
Nick Mathewson [Mon, 17 Sep 2018 02:08:02 +0000 (22:08 -0400)] 
Add tortls.h includes to expose critical macro. Fix #27734.

7 years agoDon't try to link C from rust doctests for nss detection
Nick Mathewson [Sun, 16 Sep 2018 18:34:31 +0000 (14:34 -0400)] 
Don't try to link C from rust doctests for nss detection

This is really annoying, since we can't use cfg(test) for doctests.

7 years agoMerge branch 'bug25573-034-typefix'
Nick Mathewson [Sun, 16 Sep 2018 17:46:12 +0000 (13:46 -0400)] 
Merge branch 'bug25573-034-typefix'

7 years agoFix duplicate declaration of pathbias_count_valid_cells.
Nick Mathewson [Sun, 16 Sep 2018 17:45:43 +0000 (13:45 -0400)] 
Fix duplicate declaration of pathbias_count_valid_cells.

7 years agoWhen Tor is compiled with NSS, don't claim support for LinkAuth=1
Nick Mathewson [Thu, 23 Aug 2018 15:30:18 +0000 (11:30 -0400)] 
When Tor is compiled with NSS, don't claim support for LinkAuth=1

Closes ticket 27288

7 years agoUpdate description of onion_extend_cpath() (#27333)
traumschule [Sun, 16 Sep 2018 02:01:17 +0000 (04:01 +0200)] 
Update description of onion_extend_cpath() (#27333)

7 years agoAdd a missing function for windows
Nick Mathewson [Fri, 14 Sep 2018 19:02:11 +0000 (15:02 -0400)] 
Add a missing function for windows

7 years agoExplicitly ignore BIO_set_close() return val to fix #27711
Nick Mathewson [Fri, 14 Sep 2018 17:09:10 +0000 (13:09 -0400)] 
Explicitly ignore BIO_set_close() return val to fix #27711

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 14 Sep 2018 16:56:31 +0000 (12:56 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 14 Sep 2018 16:56:30 +0000 (12:56 -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, 14 Sep 2018 16:56:30 +0000 (12:56 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agohs-v3: Don't BUG() on directory permission check failure
David Goulet [Fri, 14 Sep 2018 14:56:34 +0000 (10:56 -0400)] 
hs-v3: Don't BUG() on directory permission check failure

In hs_config.c, we do validate the permission of the hidden service directory
but we do not try to create it. So, in the event that the directory doesn't
exists, we end up in the loading key code path which checks for the
permission and possibly creates the directory. On failure, don't BUG() since
there is a perfectly valid use case for that function to fail.

Fixes #27335

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge remote-tracking branch 'dgoulet/ticket27040_035_01'
Nick Mathewson [Fri, 14 Sep 2018 16:54:13 +0000 (12:54 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket27040_035_01'

7 years agoMerge branch 'nss_countbytes_squashed'
Nick Mathewson [Fri, 14 Sep 2018 16:45:30 +0000 (12:45 -0400)] 
Merge branch 'nss_countbytes_squashed'

7 years agoAllow malloc includes in tls library
Nick Mathewson [Thu, 13 Sep 2018 14:53:22 +0000 (10:53 -0400)] 
Allow malloc includes in tls library

7 years agoAdd support for lower-level byte counting with NSS
Nick Mathewson [Thu, 13 Sep 2018 14:18:34 +0000 (10:18 -0400)] 
Add support for lower-level byte counting with NSS

This is harder than with OpenSSL, since OpenSSL counts the bytes on
its own and NSS doesn't.  To fix this, we need to define a new
PRFileDesc layer that has its own byte-counting support.

Closes ticket 27289.

7 years agohs-v2: Demote log warning to info when we don't have a consensus
David Goulet [Fri, 14 Sep 2018 16:04:01 +0000 (12:04 -0400)] 
hs-v2: Demote log warning to info when we don't have a consensus

Fixes #27040

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agorust/protover: delete ProtoSet::retain
cypherpunks [Wed, 15 Aug 2018 03:23:08 +0000 (03:23 +0000)] 
rust/protover: delete ProtoSet::retain

As the comment noted, it was horribly inefficient.

7 years agorust/protover: use .and_not_in() instead of .retain() in all_supported()
cypherpunks [Thu, 9 Aug 2018 21:26:10 +0000 (21:26 +0000)] 
rust/protover: use .and_not_in() instead of .retain() in all_supported()

.retain() would allocating a Vec of billions of integers and check them
one at a time to separate the supported versions from the unsupported.
This leads to a memory DoS.

Closes ticket 27206. Bugfix on e6625113c98c281b0a649598d7daa347c28915e9.

7 years agorust/protover: add ProtoSet::and_not_in()
cypherpunks [Thu, 9 Aug 2018 21:25:18 +0000 (21:25 +0000)] 
rust/protover: add ProtoSet::and_not_in()

This is a way more efficient version of retain().

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 14 Sep 2018 14:48:01 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 14 Sep 2018 14:48:01 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoIf options_act() fails, restore the previous value of global_options
Nick Mathewson [Fri, 14 Sep 2018 14:34:45 +0000 (10:34 -0400)] 
If options_act() fails, restore the previous value of global_options

Before 0.3.3.1-alpha, we would exit() in this case immediately.  But
now that we leave tor_main() more conventionally, we need to make
sure we restore things so as not to cause a double free.

Fixes bug 27708; bugfix on 0.3.3.1-alpha.

7 years agoMerge branch 'nss_27664'
Nick Mathewson [Fri, 14 Sep 2018 14:24:46 +0000 (10:24 -0400)] 
Merge branch 'nss_27664'

7 years agoMerge branch 'nss_27451'
Nick Mathewson [Fri, 14 Sep 2018 14:22:38 +0000 (10:22 -0400)] 
Merge branch 'nss_27451'

7 years agoTweak changes file: call this a major feature.
Nick Mathewson [Fri, 14 Sep 2018 13:32:53 +0000 (09:32 -0400)] 
Tweak changes file: call this a major feature.

7 years agoTweak message; only log it on a relay.
Nick Mathewson [Fri, 14 Sep 2018 13:32:39 +0000 (09:32 -0400)] 
Tweak message; only log it on a relay.

7 years agoMerge remote-tracking branch 'neel/b21530'
Nick Mathewson [Fri, 14 Sep 2018 13:27:03 +0000 (09:27 -0400)] 
Merge remote-tracking branch 'neel/b21530'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 14 Sep 2018 13:25:34 +0000 (09:25 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 14 Sep 2018 13:25:34 +0000 (09:25 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'onionk/rust-protokeyword1-035'
Nick Mathewson [Fri, 14 Sep 2018 13:25:31 +0000 (09:25 -0400)] 
Merge remote-tracking branch 'onionk/rust-protokeyword1-035'

7 years agoMerge remote-tracking branch 'tor-github/pr/329'
Nick Mathewson [Fri, 14 Sep 2018 13:22:23 +0000 (09:22 -0400)] 
Merge remote-tracking branch 'tor-github/pr/329'

7 years agoMerge branch 'ticket27247'
Nick Mathewson [Fri, 14 Sep 2018 13:14:12 +0000 (09:14 -0400)] 
Merge branch 'ticket27247'

7 years agoRe-order includes to expose intptr_t to tor_api_internal.h
Nick Mathewson [Fri, 14 Sep 2018 11:11:37 +0000 (07:11 -0400)] 
Re-order includes to expose intptr_t to tor_api_internal.h

7 years agoMerge branch 'rust-protokeyword1-034' into rust-protokeyword1-035
cypherpunks [Fri, 14 Sep 2018 02:33:59 +0000 (02:33 +0000)] 
Merge branch 'rust-protokeyword1-034' into rust-protokeyword1-035

7 years agoMerge branch 'rust-protokeyword1' into rust-protokeyword1-034
cypherpunks [Fri, 14 Sep 2018 02:26:31 +0000 (02:26 +0000)] 
Merge branch 'rust-protokeyword1' into rust-protokeyword1-034

7 years agoAdd log message for Tor being non-exit by default
Neel Chauhan [Fri, 14 Sep 2018 01:50:06 +0000 (21:50 -0400)] 
Add log message for Tor being non-exit by default

7 years agoIn conditionvar_timeout test, wait for threads to timeout
Nick Mathewson [Fri, 14 Sep 2018 00:47:41 +0000 (20:47 -0400)] 
In conditionvar_timeout test, wait for threads to timeout

Previously we just waited 200msec, which was not enough on slow/busy
systems.

Fixes bug 27073; bugfix on 0.2.6.3-alpha when the test was introduced.

7 years agoInclude torint.h in socketpair.c for intptr_t definition.
Nick Mathewson [Thu, 13 Sep 2018 21:54:26 +0000 (17:54 -0400)] 
Include torint.h in socketpair.c for intptr_t definition.

7 years agoFix a 32-bit off_t/size_t warning in crypto_rsa.c
Nick Mathewson [Thu, 13 Sep 2018 21:49:36 +0000 (17:49 -0400)] 
Fix a 32-bit off_t/size_t warning in crypto_rsa.c

Bug not in any released Tor.

7 years agoFix a shadowed-global warning in geoip.c
Nick Mathewson [Thu, 13 Sep 2018 21:48:33 +0000 (17:48 -0400)] 
Fix a shadowed-global warning in geoip.c

Bugfix on 5ab2110eb6b4ae9082430081cb2800018cf0dcd6; bug not in any
released Tor.

7 years agoMerge branch 'bug27224_take2_squashed'
Nick Mathewson [Thu, 13 Sep 2018 20:43:06 +0000 (16:43 -0400)] 
Merge branch 'bug27224_take2_squashed'

7 years agoAvoid calling node_get_all_orports() from node_is_a_configured_bridge()
rl1987 [Fri, 24 Aug 2018 15:26:27 +0000 (18:26 +0300)] 
Avoid calling node_get_all_orports() from node_is_a_configured_bridge()

All node_get_all_orports() does is allocate and return a smartlist
with at most two tor_addr_port_t members that match ORPort's of
node configuration. This is harmful for memory efficiency, as it
allocates the same stuff every time it is called. However,
node_is_a_configured_bridge() does not need to call it, as it
already has all the information to check if there is configured
bridge for a given node.

The new code is arranged in a way that hopefully makes each succeeding
linear search through bridge_list less likely.

7 years agoAdd a test case with a matching ip but mismatched identity.
Nick Mathewson [Thu, 13 Sep 2018 20:30:11 +0000 (16:30 -0400)] 
Add a test case with a matching ip but mismatched identity.

7 years agoUnit tests for ticket 27224.
rl1987 [Thu, 13 Sep 2018 20:21:44 +0000 (16:21 -0400)] 
Unit tests for ticket 27224.

Since this is a refactoring ticket, these tests should pass before
and after the changes are made.

7 years agoExplain PIE/PIC rationale for 23846.
Nick Mathewson [Thu, 13 Sep 2018 18:53:20 +0000 (14:53 -0400)] 
Explain PIE/PIC rationale for 23846.

7 years agoMerge branch 'ticket23846'
Nick Mathewson [Thu, 13 Sep 2018 18:51:21 +0000 (14:51 -0400)] 
Merge branch 'ticket23846'

7 years agoMerge branch 'bug26470_032'
Nick Mathewson [Thu, 13 Sep 2018 17:53:42 +0000 (13:53 -0400)] 
Merge branch 'bug26470_032'

7 years agoTicket #27678: Changes file.
Mike Perry [Thu, 13 Sep 2018 01:25:57 +0000 (01:25 +0000)] 
Ticket #27678: Changes file.

7 years agoTicket #27678: Emit CIRC_BW events immediately for dropped cells.
Mike Perry [Thu, 13 Sep 2018 01:23:17 +0000 (01:23 +0000)] 
Ticket #27678: Emit CIRC_BW events immediately for dropped cells.

We determine that a cell was dropped by inspecting CIRC_BW fields. If we did
not update the delivered or overhead fields after processing the cell, the
cell was dropped/not processed.

Also emit CIRC_BW events for cases where we decide to close the circuit in
this function, so vanguards can print messages about dropped cells in those
cases, too.

7 years agoControl port call to emit a CIRC_BW event for a single circuit.
Mike Perry [Thu, 13 Sep 2018 01:22:02 +0000 (01:22 +0000)] 
Control port call to emit a CIRC_BW event for a single circuit.

This commit only moves code. No functionality has been changed.

7 years agoChanges file for 27186
Nick Mathewson [Thu, 13 Sep 2018 17:37:29 +0000 (13:37 -0400)] 
Changes file for 27186

7 years agoMerge remote-tracking branch 'UntoSten/inform-about-conf-includes'
Nick Mathewson [Thu, 13 Sep 2018 17:35:59 +0000 (13:35 -0400)] 
Merge remote-tracking branch 'UntoSten/inform-about-conf-includes'

7 years agoMerge remote-tracking branch 'onionk/strcmpstart1'
Nick Mathewson [Thu, 13 Sep 2018 17:30:53 +0000 (13:30 -0400)] 
Merge remote-tracking branch 'onionk/strcmpstart1'

7 years agoMerge branches 'bug27684' and 'bug27685'
Nick Mathewson [Thu, 13 Sep 2018 17:09:57 +0000 (13:09 -0400)] 
Merge branches 'bug27684' and 'bug27685'

7 years agoFix a memory leak in tortls/openssl/try_to_extract_certs_from_tls
Nick Mathewson [Thu, 13 Sep 2018 16:47:42 +0000 (12:47 -0400)] 
Fix a memory leak in tortls/openssl/try_to_extract_certs_from_tls

Since this is an "intrusive" test, it only shows up for openssl <1.1

This is a bugfix on 0.3.5.x; bug not in any released Tor.

7 years agoFix a memory leak in tortls/openssl/context_new test.
Nick Mathewson [Thu, 13 Sep 2018 16:43:37 +0000 (12:43 -0400)] 
Fix a memory leak in tortls/openssl/context_new test.

Bugfix on 0.3.5.x; bugfix not on any released Tor.

7 years agorust/protover: validate unknown protocol names use only allowed characters
cypherpunks [Thu, 13 Sep 2018 16:33:58 +0000 (16:33 +0000)] 
rust/protover: validate unknown protocol names use only allowed characters

7 years agoMerge branch 'ticket27547_035_01_squashed'
Nick Mathewson [Thu, 13 Sep 2018 15:48:13 +0000 (11:48 -0400)] 
Merge branch 'ticket27547_035_01_squashed'

7 years agohs-v3: Add changes file and man page for client authorization
David Goulet [Wed, 12 Sep 2018 17:23:06 +0000 (13:23 -0400)] 
hs-v3: Add changes file and man page for client authorization

Closes #27547

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Thu, 13 Sep 2018 15:46:04 +0000 (11:46 -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, 13 Sep 2018 15:46:04 +0000 (11:46 -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 [Thu, 13 Sep 2018 15:46:04 +0000 (11:46 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Thu, 13 Sep 2018 15:46:04 +0000 (11:46 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'bug27658_029' into maint-0.2.9
Nick Mathewson [Thu, 13 Sep 2018 15:45:58 +0000 (11:45 -0400)] 
Merge branch 'bug27658_029' into maint-0.2.9

7 years agoRun crypto_prefork() before start_daemon().
Nick Mathewson [Thu, 13 Sep 2018 12:58:28 +0000 (08:58 -0400)] 
Run crypto_prefork() before start_daemon().

Without this, RunAsDaemon breaks NSS.

Fixes bug 27664; bug not in any released Tor.

7 years agoconn: Fix memleaks in retry_all_listeners
David Goulet [Wed, 12 Sep 2018 21:51:52 +0000 (17:51 -0400)] 
conn: Fix memleaks in retry_all_listeners

Fixes #27670

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoReport UNIX connection addresses that we opened correctly.
Nick Mathewson [Wed, 12 Sep 2018 21:42:24 +0000 (17:42 -0400)] 
Report UNIX connection addresses that we opened correctly.

This is an aside on ticket27670.