]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 10 May 2018 12:03:43 +0000 (08:03 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 10 May 2018 12:03:04 +0000 (08:03 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 10 May 2018 12:02:10 +0000 (08:02 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Thu, 10 May 2018 12:00:35 +0000 (08:00 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'ticket26016'
Nick Mathewson [Wed, 9 May 2018 18:04:30 +0000 (14:04 -0400)] 
Merge branch 'ticket26016'

7 years agoMerge branch 'ticket26009'
Nick Mathewson [Wed, 9 May 2018 18:01:08 +0000 (14:01 -0400)] 
Merge branch 'ticket26009'

7 years agospelling fix
Nick Mathewson [Wed, 9 May 2018 16:00:39 +0000 (12:00 -0400)] 
spelling fix

7 years agoFix some clang warnings
Nick Mathewson [Thu, 3 May 2018 16:31:35 +0000 (12:31 -0400)] 
Fix some clang warnings

7 years agoMark the 1-per-sec update_current_time() call as redundant.
Nick Mathewson [Thu, 3 May 2018 16:23:55 +0000 (12:23 -0400)] 
Mark the 1-per-sec update_current_time() call as redundant.

We still do this time update here, since we do it from all
callbacks, but it is no longer a reason to keep the once-per-second
callback enabled.

Closes ticket 26009.

7 years agoDistinguish true clock jumps from idleness
Nick Mathewson [Thu, 3 May 2018 15:51:32 +0000 (11:51 -0400)] 
Distinguish true clock jumps from idleness

Since we're going to be disabling the second-elapsed callback, we're
going to sometimes have long periods when no events file, and so the
current second is not updated.  Handle that by having a better means
to detect "clock jumps" as opposed to "being idle for a while".
Tolerate far more of the latter.

Part of #26009.

7 years agoHaving a ControlPort open doesn't mean we are a client
David Goulet [Wed, 9 May 2018 16:40:06 +0000 (12:40 -0400)] 
Having a ControlPort open doesn't mean we are a client

The any_client_port_set() returns true if the ControlPort is set which is
wrong because we can have that port open but still not behave as a tor client
(like many relays for instance).

Fixes #26062

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 9 May 2018 15:53:18 +0000 (11:53 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 9 May 2018 15:53:18 +0000 (11:53 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2
Nick Mathewson [Wed, 9 May 2018 15:53:15 +0000 (11:53 -0400)] 
Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 9 May 2018 12:25:52 +0000 (08:25 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'libressl_201805_033' into maint-0.3.3
Nick Mathewson [Wed, 9 May 2018 12:25:32 +0000 (08:25 -0400)] 
Merge branch 'libressl_201805_033' into maint-0.3.3

7 years agoMerge remote-tracking branch 'public/bug26005_034'
Nick Mathewson [Wed, 9 May 2018 12:23:27 +0000 (08:23 -0400)] 
Merge remote-tracking branch 'public/bug26005_034'

7 years agoDetect when v3 services get disabled after HUP.
George Kadianakis [Tue, 8 May 2018 15:14:02 +0000 (18:14 +0300)] 
Detect when v3 services get disabled after HUP.

Remove v3 optimization which made Tor not detect disabling services.

This optimization is not so needed because we only call that function after HUP
anyway.

Fixes bug #25761.

7 years agoDetect when v2 services get disabled after HUP.
George Kadianakis [Tue, 8 May 2018 15:07:08 +0000 (18:07 +0300)] 
Detect when v2 services get disabled after HUP.

During service configuration, rend_service_prune_list_impl_() sets
rend_service_staging_list to NULL, which blocked pruning after a HUP.

This patch initializes rend_service_staging_list when needed, so that HUP can
detect disabled onion services.

Fixes bug #25761.

7 years agoFix compilation of test_addr.c
Nick Mathewson [Wed, 9 May 2018 00:20:54 +0000 (20:20 -0400)] 
Fix compilation of test_addr.c

This needs to include crypto_rand.h (which it didn't before it was
merged).

7 years agoMerge branch 'ticket25993_squashed'
Nick Mathewson [Wed, 9 May 2018 00:09:42 +0000 (20:09 -0400)] 
Merge branch 'ticket25993_squashed'

7 years agoMore unit tests for addressmap_get_virtual_address().
Nick Mathewson [Tue, 1 May 2018 19:28:42 +0000 (15:28 -0400)] 
More unit tests for addressmap_get_virtual_address().

Previously the coverage on this function was mostly accidental,
coming as it did from test_entryconn.c.  These new tests use mocking
to ensure that we actually hit the different failure and retry cases
of addressmap_get_virtual_address(), and make our test coverage a
bit more deterministic.

Closes ticket 25993.

7 years agoMerge remote-tracking branch 'hello71/bug23883'
Nick Mathewson [Wed, 9 May 2018 00:05:35 +0000 (20:05 -0400)] 
Merge remote-tracking branch 'hello71/bug23883'

7 years agoUpdate rust submodule.
Nick Mathewson [Tue, 8 May 2018 22:51:31 +0000 (18:51 -0400)] 
Update rust submodule.

7 years agorust: Add crypto crate and implement Rust wrappers for SHA2 code.
Isis Lovecruft [Sat, 21 Apr 2018 01:01:04 +0000 (01:01 +0000)] 
rust: Add crypto crate and implement Rust wrappers for SHA2 code.

 * FIXES #24659: https://bugs.torproject.org/24659

7 years agoMerge branch 'bug26004_029_squashed'
Nick Mathewson [Tue, 8 May 2018 18:26:05 +0000 (14:26 -0400)] 
Merge branch 'bug26004_029_squashed'

7 years agoAdd a changes file for ticket 26004.
Nick Mathewson [Mon, 7 May 2018 17:57:14 +0000 (13:57 -0400)] 
Add a changes file for ticket 26004.

7 years agoAvoid unsigned integer underflow on empty input.
Nick Mathewson [Mon, 7 May 2018 17:56:39 +0000 (13:56 -0400)] 
Avoid unsigned integer underflow on empty input.

7 years agoAllow bandwidth-file lines to have node_id in the last position
juga0 [Thu, 3 May 2018 08:29:57 +0000 (08:29 +0000)] 
Allow bandwidth-file lines to have node_id in the last position

Closes ticket 26004.

7 years agoMerge remote-tracking branch 'mikeperry/bug25870_rebase'
Nick Mathewson [Tue, 8 May 2018 18:12:29 +0000 (14:12 -0400)] 
Merge remote-tracking branch 'mikeperry/bug25870_rebase'

7 years agoMerge branch 'ticket26008'
Nick Mathewson [Tue, 8 May 2018 18:09:38 +0000 (14:09 -0400)] 
Merge branch 'ticket26008'

7 years agoMerge branch 'maint-0.3.3'
Roger Dingledine [Tue, 8 May 2018 17:49:56 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.3'

7 years agomanpage fix to stop saying CacheIPv4DNS is on by default
Roger Dingledine [Tue, 8 May 2018 17:13:45 +0000 (13:13 -0400)] 
manpage fix to stop saying CacheIPv4DNS is on by default

Stop saying in the manual that clients cache ipv4 dns answers from exit
relays. We haven't used them since 0.2.6.3-alpha, and in ticket 24050
we stopped even caching them as of 0.3.2.6-alpha, but we forgot to say
so in the man page.

Fixes bug 26052; bugfix on 0.3.2.6-alpha.

7 years agoBug 25870: Mention path restriction differences in manpage.
Mike Perry [Tue, 8 May 2018 16:35:20 +0000 (16:35 +0000)] 
Bug 25870: Mention path restriction differences in manpage.

7 years agominor cleanups on commit 17daab76
Roger Dingledine [Tue, 8 May 2018 16:21:24 +0000 (12:21 -0400)] 
minor cleanups on commit 17daab76

better punctuation and clearer wording

7 years agoAdd Travis CI instructions. fixes #23883
Alex Xu (Hello71) [Sat, 28 Apr 2018 23:51:29 +0000 (19:51 -0400)] 
Add Travis CI instructions. fixes #23883

7 years agoMerge remote-tracking branch 'catalyst-github/bug26036'
Nick Mathewson [Mon, 7 May 2018 18:38:26 +0000 (14:38 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug26036'

7 years agoRestore sys/random.h inclusion for getentropy()
Taylor Yu [Mon, 7 May 2018 17:43:39 +0000 (12:43 -0500)] 
Restore sys/random.h inclusion for getentropy()

Code movement for the refactoring for ticket 24658 didn't copy the
inclusion of sys/random.h, which is needed to get a prototype for
getentropy() on macOS 10.12 Sierra.  It also didn't copy the inclusion
of sys/syscall.h, which might prevent the getrandom() syscall from
being properly detected.  Move these inclusions.  Bug not in any
released Tor.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Mon, 7 May 2018 17:33:19 +0000 (13:33 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
Nick Mathewson [Mon, 7 May 2018 17:33:12 +0000 (13:33 -0400)] 
Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3

7 years agoMerge remote-tracking branch 'saper/default_nickname'
Nick Mathewson [Mon, 7 May 2018 17:31:03 +0000 (13:31 -0400)] 
Merge remote-tracking branch 'saper/default_nickname'

7 years agoMerge branch 'ticket26014'
Nick Mathewson [Mon, 7 May 2018 16:07:53 +0000 (12:07 -0400)] 
Merge branch 'ticket26014'

7 years agoMerge remote-tracking branch 'mikeperry/bug25705_v3_033'
Nick Mathewson [Mon, 7 May 2018 15:09:25 +0000 (11:09 -0400)] 
Merge remote-tracking branch 'mikeperry/bug25705_v3_033'

7 years agoFix the selection of events to cancel in test_workqueue.c
Nick Mathewson [Mon, 7 May 2018 01:03:26 +0000 (21:03 -0400)] 
Fix the selection of events to cancel in test_workqueue.c

Our previous algorithm had a nonzero probability of picking no
events to cancel, which is of course incorrect.  The new code uses
Vitter's good old reservoir sampling "algorithm R" from 1985.

Fixes bug 26008; bugfix on 0.2.6.3-alpha.

7 years agoAdd unit test for ..get_start_of_next_voting_interval().
Nick Mathewson [Mon, 7 May 2018 00:42:18 +0000 (20:42 -0400)] 
Add unit test for ..get_start_of_next_voting_interval().

This functionality was covered only accidentally by our voting-test
code, and as such wasn't actually tested at all.  The tests that
called it made its coverage nondeterministic, depending on what time
of day you ran the tests.

Closes ticket 26014.

7 years agobuild: Fix missing include for src/rust/external/crypto_rand.rs file.
Isis Lovecruft [Fri, 4 May 2018 22:23:17 +0000 (22:23 +0000)] 
build: Fix missing include for src/rust/external/crypto_rand.rs file.

 * FIXES #26025: https://bugs.torproject.org/26025

7 years agorust: Update Cargo.lock file with changes from #26024.
Isis Lovecruft [Fri, 4 May 2018 20:41:25 +0000 (20:41 +0000)] 
rust: Update Cargo.lock file with changes from #26024.

7 years agorust: Update submodule commit for src/ext/rust directory.
Isis Lovecruft [Fri, 4 May 2018 20:37:16 +0000 (20:37 +0000)] 
rust: Update submodule commit for src/ext/rust directory.

 * FIXES part of #26024: https://bugs.torproject.org/26024

7 years agoUpdate rand dependency from 0.5.0-pre.0 to 0.5.0-pre.1.
Isis Lovecruft [Fri, 4 May 2018 19:16:42 +0000 (19:16 +0000)] 
Update rand dependency from 0.5.0-pre.0 to 0.5.0-pre.1.

7 years agoI should have tested before I pushed.
Nick Mathewson [Fri, 4 May 2018 00:16:53 +0000 (20:16 -0400)] 
I should have tested before I pushed.

7 years agoMerge remote-tracking branch 'github/ticket25995'
Nick Mathewson [Thu, 3 May 2018 20:52:09 +0000 (16:52 -0400)] 
Merge remote-tracking branch 'github/ticket25995'

7 years agoMerge remote-tracking branch 'dgoulet/ticket25914_034_01'
Nick Mathewson [Thu, 3 May 2018 20:48:03 +0000 (16:48 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket25914_034_01'

7 years agoAdd src/rust/rand to include.am
Nick Mathewson [Thu, 3 May 2018 20:16:09 +0000 (16:16 -0400)] 
Add src/rust/rand to include.am

7 years agoMove some includes around to try to fix windows builds
Nick Mathewson [Thu, 3 May 2018 20:14:38 +0000 (16:14 -0400)] 
Move some includes around to try to fix windows builds

7 years agoUpdate rust dependencies to latest version.
Nick Mathewson [Thu, 3 May 2018 17:55:55 +0000 (13:55 -0400)] 
Update rust dependencies to latest version.

7 years agoMerge remote-tracking branch 'isis/bug24660_r1'
Nick Mathewson [Thu, 3 May 2018 17:50:18 +0000 (13:50 -0400)] 
Merge remote-tracking branch 'isis/bug24660_r1'

7 years agoMerge remote-tracking branch 'dgoulet/ticket25991_034_01'
Nick Mathewson [Thu, 3 May 2018 17:41:34 +0000 (13:41 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket25991_034_01'

7 years agoMerge remote-tracking branch 'dgoulet/ticket25990_034_01'
Nick Mathewson [Thu, 3 May 2018 17:40:10 +0000 (13:40 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket25990_034_01'

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Thu, 3 May 2018 17:38:54 +0000 (13:38 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 3 May 2018 17:38:54 +0000 (13:38 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 3 May 2018 17:38:54 +0000 (13:38 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 3 May 2018 17:38:54 +0000 (13:38 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
Nick Mathewson [Thu, 3 May 2018 17:38:51 +0000 (13:38 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3

7 years agoMerge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
Nick Mathewson [Thu, 3 May 2018 17:38:46 +0000 (13:38 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1

7 years agoMerge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
Nick Mathewson [Thu, 3 May 2018 17:38:37 +0000 (13:38 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 3 May 2018 17:37:37 +0000 (13:37 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'teor/bug25998' into maint-0.3.3
Nick Mathewson [Thu, 3 May 2018 17:37:33 +0000 (13:37 -0400)] 
Merge remote-tracking branch 'teor/bug25998' into maint-0.3.3

7 years agoUse OPENSSL_1_1_API in place of raw OPENSSL_VERSION_NUMBER checks
Nick Mathewson [Thu, 3 May 2018 17:33:14 +0000 (13:33 -0400)] 
Use OPENSSL_1_1_API in place of raw OPENSSL_VERSION_NUMBER checks

This is needed for libressl-2.6.4 compatibility, which we broke when
we merged a15b2c57e1f901c53 to fix bug 19981.  Fixes bug 26005; bug
not in any released Tor.

7 years agoRefactor to remove n_libevent_errors
Nick Mathewson [Thu, 3 May 2018 16:44:00 +0000 (12:44 -0400)] 
Refactor to remove n_libevent_errors

We cleared this value in second_elapsed_callback.  But what were we
using it for?  For detecting if Libevent returned EINVAL too often!
We already have a way to detect too-frequent events, and that's with
a ratelim_t.  Refactor the code to use that instead.  Closes ticket
26016.

7 years agoAdd update_current_time() calls to periodic and event-driven callbacks
Nick Mathewson [Thu, 3 May 2018 14:56:49 +0000 (10:56 -0400)] 
Add update_current_time() calls to periodic and event-driven callbacks

This is part of 26009, where we're going to keep track of the
current time and its jumps without having to do so in
second_elapsed_callback.

7 years agoBasic unit tests for update_current_time().
Nick Mathewson [Thu, 3 May 2018 14:53:19 +0000 (10:53 -0400)] 
Basic unit tests for update_current_time().

This function is about to get more complicated, so we should track
how it's working.

7 years agoMove the "update the current second" code from second_elapsed_callback
Nick Mathewson [Thu, 3 May 2018 14:35:49 +0000 (10:35 -0400)] 
Move the "update the current second" code from second_elapsed_callback

This now happens in a new function, with the intent of having it
invoked from our callbacks.  This is one step on the way to 26009.

7 years agoMerge remote-tracking branch 'github/ticket25952'
Nick Mathewson [Thu, 3 May 2018 15:59:53 +0000 (11:59 -0400)] 
Merge remote-tracking branch 'github/ticket25952'

7 years agoMerge remote-tracking branch 'github/ticket25951'
Nick Mathewson [Thu, 3 May 2018 15:59:31 +0000 (11:59 -0400)] 
Merge remote-tracking branch 'github/ticket25951'

7 years agoMerge remote-tracking branch 'github/ticket25949'
Nick Mathewson [Thu, 3 May 2018 15:57:09 +0000 (11:57 -0400)] 
Merge remote-tracking branch 'github/ticket25949'

7 years agodoc: Add missing HACKING/ files to EXTRA_DIST
David Goulet [Wed, 2 May 2018 18:28:40 +0000 (14:28 -0400)] 
doc: Add missing HACKING/ files to EXTRA_DIST

Apart from adding the newly created Module.md, this commit also adds all the
missing files we have in HACKING/ to the EXTRA_DIST.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agodoc: Add Module.md explaining Tor modules
David Goulet [Wed, 2 May 2018 18:24:46 +0000 (14:24 -0400)] 
doc: Add Module.md explaining Tor modules

Initial document that contains guidelines to write a new module in Tor.

Closes #25991

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agohs-v3: Remove extra white-space and clarify comment
David Goulet [Thu, 3 May 2018 13:34:50 +0000 (09:34 -0400)] 
hs-v3: Remove extra white-space and clarify comment

From Neel's latest patch on optimizing the hs_circ_service_get_intro_circ()
digest calculation, remove an extra white-space and clarify a comment of the
legacy key digest to inform when to use it.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge remote-tracking branch 'asn/bug23107'
David Goulet [Thu, 3 May 2018 13:33:42 +0000 (09:33 -0400)] 
Merge remote-tracking branch 'asn/bug23107'

7 years agorust: Expose crypto_rand() as an impl of rand_core::RngCore.
Isis Lovecruft [Wed, 2 May 2018 22:12:38 +0000 (22:12 +0000)] 
rust: Expose crypto_rand() as an impl of rand_core::RngCore.

7 years agoMerge branch 'ticket25997'
Nick Mathewson [Wed, 2 May 2018 20:03:57 +0000 (16:03 -0400)] 
Merge branch 'ticket25997'

7 years agodirauth: Move authdir_mode_v3() to module
David Goulet [Wed, 2 May 2018 17:42:24 +0000 (13:42 -0400)] 
dirauth: Move authdir_mode_v3() to module

This function must return false if the module is not compiled in. In order to
do that, we move the authdir_mode_v3() function out of router.c and into the
dirauth module new header file named mode.h.

It is always returning false if we don't have the module.

Closes #25990

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMake hs_get_responsible_hsdirs() deterministic.
Nick Mathewson [Wed, 2 May 2018 14:16:23 +0000 (10:16 -0400)] 
Make hs_get_responsible_hsdirs() deterministic.

This test was using the current time to pick the time period number,
and a randomly generated hs key.  Therefore, it sometimes picked an
index that would wrap around the example dht, and sometimes would
not.

The fix here is just to fix the time period and the public key.

Fixes bug 25997; bugfix on 0.3.2.1-alpha.

7 years agodirvote: Fix typo in comment
David Goulet [Wed, 2 May 2018 13:06:40 +0000 (09:06 -0400)] 
dirvote: Fix typo in comment

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 2 May 2018 12:46:28 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Wed, 2 May 2018 12:46:28 +0000 (08:46 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 2 May 2018 12:46:28 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 2 May 2018 12:46:28 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'ticket25996'
Nick Mathewson [Wed, 2 May 2018 12:45:35 +0000 (08:45 -0400)] 
Merge branch 'ticket25996'

7 years agoStop logging stack contents when reading a zero-length bandwidth file
teor [Wed, 2 May 2018 12:33:21 +0000 (22:33 +1000)] 
Stop logging stack contents when reading a zero-length bandwidth file

When directory authorities read a zero-byte bandwidth file, they log
a warning with the contents of an uninitialised buffer. Log a warning
about the empty file instead.

Fixes bug 26007; bugfix on 0.2.2.1-alpha.

7 years agoMerge branch 'libressl_201805_029' into maint-0.3.3
Nick Mathewson [Wed, 2 May 2018 12:26:49 +0000 (08:26 -0400)] 
Merge branch 'libressl_201805_029' into maint-0.3.3

7 years agoLibreSSL compatibility fixes.
Nick Mathewson [Wed, 2 May 2018 12:18:48 +0000 (08:18 -0400)] 
LibreSSL compatibility fixes.

LibreSSL, despite not having the OpenSSL 1.1 API, does define
OPENSSL_VERSION in crypto.h.  Additionally, it apparently annotates
some functions as returning NULL, so that our unit tests need to be
more careful about checking for NULL so they don't get compilation
warnings.

Closes ticket 26006.

7 years agoBug 26000: Fix missing ";"
Georg Koppen [Wed, 2 May 2018 06:20:26 +0000 (06:20 +0000)] 
Bug 26000: Fix missing ";"

7 years agosquash! Optimize legacy intro point digest calculation.
George Kadianakis [Wed, 2 May 2018 11:09:15 +0000 (14:09 +0300)] 
squash! Optimize legacy intro point digest calculation.

7 years agoOptimize legacy intro point digest calculation.
Neel Chauhan [Fri, 27 Apr 2018 21:45:16 +0000 (17:45 -0400)] 
Optimize legacy intro point digest calculation.

7 years agoman page: FetchUselessDescriptors and DirCache exclude extra infos
teor [Wed, 2 May 2018 01:29:48 +0000 (11:29 +1000)] 
man page: FetchUselessDescriptors and DirCache exclude extra infos

7 years agoman page: UseMicrodescriptors auto and 1 are the same now
teor [Wed, 2 May 2018 00:46:10 +0000 (10:46 +1000)] 
man page: UseMicrodescriptors auto and 1 are the same now

7 years agoman page: FetchUselessDescriptors stops tor going idle
teor [Wed, 2 May 2018 00:46:00 +0000 (10:46 +1000)] 
man page: FetchUselessDescriptors stops tor going idle

Also explain how FetchUselessDescriptors and UseMicrodescriptors are
different.

Closes 25998.

7 years agocoverage: Repeat the test for avoiding failed intro points
Nick Mathewson [Tue, 1 May 2018 23:58:39 +0000 (19:58 -0400)] 
coverage: Repeat the test for avoiding failed intro points

This test, in test_client_pick_intro(), will have different coverage
depending on whether it selects a good intro point the first time or
whether it has to try a few times.  Since it produces the shorter
coverage with P=1/4, repeat this test 64 times so that it only
provides reduced coverage with P=1/2^128.  The performance cost is
negligible.

Closes ticket 25996.  This test was introduced in 0.3.2.1-alpha.

7 years agoUse a deterministic PRNG in test_circuit_timeout()
Nick Mathewson [Tue, 1 May 2018 23:34:21 +0000 (19:34 -0400)] 
Use a deterministic PRNG in test_circuit_timeout()

I'd prefer not to do this for randomized tests, but as things stand
with this test, it produces nondeterministic test coverage.

Closes ticket 25995; bugfix on 0.2.2.2-alpha when this test was
introduced.