]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoAdd a CONTRIBUTING file
Nick Mathewson [Fri, 11 May 2018 17:19:37 +0000 (13:19 -0400)] 
Add a CONTRIBUTING file

This file contains pointers to other important top-level resources,
and some info about acceptable licenses.  Also, add that info to
CodingStandards.md

7 years agocontrol: Mask the event(s) before using ANY_EVENT_IS_INTERESTING()
David Goulet [Fri, 11 May 2018 12:58:11 +0000 (08:58 -0400)] 
control: Mask the event(s) before using ANY_EVENT_IS_INTERESTING()

Before this commit, the control events were never triggered. It was introduced
with commit 0c19ce7bdece5906e035e71d3fb682632c8bb9cb.

Fixes #26082

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge remote-tracking branch 'asn-github/bug26078'
Nick Mathewson [Fri, 11 May 2018 12:20:49 +0000 (08:20 -0400)] 
Merge remote-tracking branch 'asn-github/bug26078'

7 years agoProperly ignore retval of event_del().
George Kadianakis [Fri, 11 May 2018 12:17:52 +0000 (15:17 +0300)] 
Properly ignore retval of event_del().

Fixes #26078: CID 1435546.

7 years agochanges file for 25943 and 25944
Nick Mathewson [Fri, 11 May 2018 12:16:02 +0000 (08:16 -0400)] 
changes file for 25943 and 25944

7 years agoMerge remote-tracking branch 'saper-github/x509_cert_free_crash'
Nick Mathewson [Fri, 11 May 2018 12:09:26 +0000 (08:09 -0400)] 
Merge remote-tracking branch 'saper-github/x509_cert_free_crash'

7 years agotesting: X509 certificate structure needs to be initialized
Marcin Cieślak [Fri, 11 May 2018 00:16:52 +0000 (00:16 +0000)] 
testing: X509 certificate structure needs to be initialized

We alloc/free X.509 structures in three ways:

1) X509 structure allocated with X509_new() and X509_free()

2) Fake X509 structure allocated with fake_x509_malloc() and fake_x509_free()
   May contain valid pointers inside.

3) Empty X509 structure shell allocated with tor_malloc_zero() and
   freed with tor_free()

7 years agoMerge remote-tracking branch 'public/bug25981'
Nick Mathewson [Thu, 10 May 2018 23:31:11 +0000 (19:31 -0400)] 
Merge remote-tracking branch 'public/bug25981'

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 10 May 2018 13:22:32 +0000 (09:22 -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 13:22:32 +0000 (09:22 -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 13:22:32 +0000 (09:22 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1
Nick Mathewson [Thu, 10 May 2018 13:22:14 +0000 (09:22 -0400)] 
Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 10 May 2018 13:19:28 +0000 (09:19 -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 13:19:28 +0000 (09:19 -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 13:19:28 +0000 (09:19 -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 13:19:28 +0000 (09:19 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9
Nick Mathewson [Thu, 10 May 2018 13:19:09 +0000 (09:19 -0400)] 
Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

7 years agohs-v3: Add an extra white-space when parsing descriptor
David Goulet [Thu, 10 May 2018 13:16:50 +0000 (09:16 -0400)] 
hs-v3: Add an extra white-space when parsing descriptor

The specification describes the signature token to be right after a newline
(\n) then the token "signature" and then a white-space followed by the encoded
signature.

This commit makes sure that when we parse the signature from the descriptor,
we are always looking for that extra white-space at the end of the token.

It will allow us also to support future fields that might start with
"signature".

Fixes #26069

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'ticket26063_squashed'
Nick Mathewson [Thu, 10 May 2018 13:13:28 +0000 (09:13 -0400)] 
Merge branch 'ticket26063_squashed'

7 years agoMerge branch 'ticket26064'
Nick Mathewson [Thu, 10 May 2018 13:05:15 +0000 (09:05 -0400)] 
Merge branch 'ticket26064'

7 years agoEnable/disable per-second callback as needed.
Nick Mathewson [Wed, 9 May 2018 16:47:59 +0000 (12:47 -0400)] 
Enable/disable per-second callback as needed.

There are three cases where this can happen: changes in our
controller events, changes in our DisableNetwork setting, and
changes in our hibernation state.

Closes ticket 26063.

7 years agoAdd a new function to enable/disable the per-second timer as needed
Nick Mathewson [Wed, 9 May 2018 16:40:45 +0000 (12:40 -0400)] 
Add a new function to enable/disable the per-second timer as needed

We're about to use this to turn off the per-second timer when the
network is disabled and there aren't any per-second controller
events enabled.

7 years agoRemove a workaround for ancient libevent versions.
Nick Mathewson [Wed, 9 May 2018 16:38:50 +0000 (12:38 -0400)] 
Remove a workaround for ancient libevent versions.

Libevent has accepted a const timeval argument to event_add() for a
very long time now.

7 years agoAdd functions to enable/disable periodic_event_t objects.
Nick Mathewson [Wed, 9 May 2018 16:37:47 +0000 (12:37 -0400)] 
Add functions to enable/disable periodic_event_t objects.

7 years agoMerge remote-tracking branch 'dgoulet/ticket26062_034_01'
Nick Mathewson [Thu, 10 May 2018 12:04:03 +0000 (08:04 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket26062_034_01'

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 agoGive responsibility for waking up from DORMANT to a mainloop event
Nick Mathewson [Wed, 9 May 2018 17:41:04 +0000 (13:41 -0400)] 
Give responsibility for waking up from DORMANT to a mainloop event

Closes ticket 26064.

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 agoHaving a ControlPort open doesn't mean we are a client
David Goulet [Wed, 25 Apr 2018 17:43:37 +0000 (13:43 -0400)] 
Having a ControlPort open doesn't mean we are a client

The options_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 agoconfig: Move any_client_port_set() to config.c
David Goulet [Wed, 25 Apr 2018 17:41:04 +0000 (13:41 -0400)] 
config: Move any_client_port_set() to config.c

This functions is now used outside of networkstatus.c and makes more sense to
be in config.c.

It is also renamed to options_any_client_port_set() for the config.c
namespace.

No code behavior change.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoUse net_is_completely_disabled() in connection.c
Nick Mathewson [Wed, 9 May 2018 16:26:50 +0000 (12:26 -0400)] 
Use net_is_completely_disabled() in connection.c

This fixes the XXXX case that we had before, and also enforces the
rule that we won't open connections when we're in hard hibernation.

7 years agoAdd a new net_is_completely_disabled() function
Nick Mathewson [Wed, 9 May 2018 16:21:08 +0000 (12:21 -0400)] 
Add a new net_is_completely_disabled() function

7 years agoComment-only fix: annotate we_are_hibernating() usage
Nick Mathewson [Wed, 9 May 2018 16:18:04 +0000 (12:18 -0400)] 
Comment-only fix: annotate we_are_hibernating() usage

Everywhere we use we_are_hibernating(), remind the reader what it
means.

(Also, add an XXXX to note a DisableNetwork usage to change later.)

7 years agoAdd we_are_fully_hibernating() to distinguish hibernation states
Nick Mathewson [Wed, 9 May 2018 16:11:14 +0000 (12:11 -0400)] 
Add we_are_fully_hibernating() to distinguish hibernation states

We want to tell "shut down" from "shutting down".

7 years agoGive control.c responsibility for its own once-a-second events
Nick Mathewson [Mon, 7 May 2018 21:41:54 +0000 (17:41 -0400)] 
Give control.c responsibility for its own once-a-second events

Now it has a function that can tell the rest of Tor whether any
once-a-second controller item should fire, and a function to fire
all the once-a-second events.

7 years agoAdd a macro to simplify control_update_global_event_mask().
Nick Mathewson [Mon, 7 May 2018 20:35:52 +0000 (16:35 -0400)] 
Add a macro to simplify control_update_global_event_mask().

7 years agoTest read bandwidth measurements with empty file
juga0 [Tue, 8 May 2018 16:23:37 +0000 (16:23 +0000)] 
Test read bandwidth measurements with empty file

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 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 '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 agoDon't crash when closing a connection before initializing libevent
Nick Mathewson [Mon, 7 May 2018 18:30:30 +0000 (14:30 -0400)] 
Don't crash when closing a connection before initializing libevent

Fixes bug 25981; bugfix on 96c5ac338a7df.  Bug not in any released
version of Tor.

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