]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoFix a compiler warning
Nick Mathewson [Wed, 6 Dec 2017 20:46:54 +0000 (15:46 -0500)] 
Fix a compiler warning

8 years agoMerge remote-tracking branch 'public/monotime_coarse_stamps'
Nick Mathewson [Wed, 6 Dec 2017 20:43:50 +0000 (15:43 -0500)] 
Merge remote-tracking branch 'public/monotime_coarse_stamps'

8 years agoMerge remote-tracking branch 'teor/bug24488'
Nick Mathewson [Wed, 6 Dec 2017 19:44:03 +0000 (14:44 -0500)] 
Merge remote-tracking branch 'teor/bug24488'

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Wed, 6 Dec 2017 19:38:06 +0000 (14:38 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2
Nick Mathewson [Wed, 6 Dec 2017 19:37:53 +0000 (14:37 -0500)] 
Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2

8 years agoMerge remote-tracking branch 'teor/bug24489'
Nick Mathewson [Wed, 6 Dec 2017 19:37:15 +0000 (14:37 -0500)] 
Merge remote-tracking branch 'teor/bug24489'

8 years agoMerge remote-tracking branch 'dgoulet/bug24502_032_01'
Nick Mathewson [Wed, 6 Dec 2017 19:31:33 +0000 (14:31 -0500)] 
Merge remote-tracking branch 'dgoulet/bug24502_032_01'

8 years agotest: Add a KIST test for a non opened channel
David Goulet [Wed, 6 Dec 2017 16:33:01 +0000 (11:33 -0500)] 
test: Add a KIST test for a non opened channel

This makes sure that a non opened channel is never put back in the channel
pending list and that its state is consistent with what we expect that is
IDLE.

Test the fixes in #24502.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoCheck the return value of hs_parse_address().
Alexander Færøy [Wed, 6 Dec 2017 13:52:02 +0000 (14:52 +0100)] 
Check the return value of hs_parse_address().

This patch adds a check for the return value of `hs_parse_address()` in
`hs_control_hspost_command()`. Since it should not be possible for
`hs_parse_address()` to fail in this context we wrap the error check
with the `BUG()` macro.

See: https://bugs.torproject.org/24543

8 years agoInitialize pk so that older gcc versions don't freak out.
Nick Mathewson [Wed, 6 Dec 2017 01:00:49 +0000 (20:00 -0500)] 
Initialize pk so that older gcc versions don't freak out.

8 years agoMerge branch 'more_directories_squashed'
Nick Mathewson [Wed, 6 Dec 2017 00:49:45 +0000 (19:49 -0500)] 
Merge branch 'more_directories_squashed'

8 years agoadd a changes file
Nick Mathewson [Tue, 14 Nov 2017 23:27:18 +0000 (18:27 -0500)] 
add a changes file

8 years agoUpdate the manpage to describe {Cache,Key}Directory
Nick Mathewson [Tue, 14 Nov 2017 23:24:15 +0000 (18:24 -0500)] 
Update the manpage to describe {Cache,Key}Directory

Also, explain which files should be put in which.

8 years agoImplement the various get_foodir_*() functions.
Nick Mathewson [Tue, 14 Nov 2017 23:14:08 +0000 (18:14 -0500)] 
Implement the various get_foodir_*() functions.

8 years agoCreate a CacheDirectory and KeyDirectory options.
Nick Mathewson [Tue, 14 Nov 2017 22:07:40 +0000 (17:07 -0500)] 
Create a CacheDirectory and KeyDirectory options.

They work the same as DataDirectory, but default slightly different.

Tor is not actually updated to use them yet.

8 years agoClean up a needlessly complex get_datadir_fname use
Nick Mathewson [Tue, 14 Nov 2017 21:54:20 +0000 (16:54 -0500)] 
Clean up a needlessly complex get_datadir_fname use

8 years agoNew accessors for keydir/cachedir access
Nick Mathewson [Tue, 14 Nov 2017 21:49:41 +0000 (16:49 -0500)] 
New accessors for keydir/cachedir access

This patch is a result of auditing all of our uses of
get_datadir_fname() and its kin, and dividing them into cache vs
keys vs other data.

The new get_keydir_fname() and get_cachedir_fname() functions don't
actually do anything new yet.

8 years agoExtract common code for creating the keys directory.
Nick Mathewson [Tue, 14 Nov 2017 21:18:53 +0000 (16:18 -0500)] 
Extract common code for creating the keys directory.

This had somehow gotten duplicated between router.c and routerkeys.c

8 years agoUse get_datadir_fname() accessor in networkstatus.c
Nick Mathewson [Tue, 14 Nov 2017 21:10:12 +0000 (16:10 -0500)] 
Use get_datadir_fname() accessor in networkstatus.c

8 years agoExtract the code that creates the datadir into a separate function.
Nick Mathewson [Tue, 14 Nov 2017 21:03:25 +0000 (16:03 -0500)] 
Extract the code that creates the datadir into a separate function.

8 years agoMerge branch 'dgoulet_ticket20699_033_01'
Nick Mathewson [Wed, 6 Dec 2017 00:43:23 +0000 (19:43 -0500)] 
Merge branch 'dgoulet_ticket20699_033_01'

8 years agocontrol: Add changes file for HSv3 control port
David Goulet [Tue, 5 Dec 2017 19:54:00 +0000 (14:54 -0500)] 
control: Add changes file for HSv3 control port

Part of #20699.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agocontrol: Improve ADD_ONION helper function comments
David Goulet [Tue, 5 Dec 2017 19:30:47 +0000 (14:30 -0500)] 
control: Improve ADD_ONION helper function comments

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agocontrol: Don't use void pointer for ADD_ONION secret key
David Goulet [Tue, 5 Dec 2017 19:24:00 +0000 (14:24 -0500)] 
control: Don't use void pointer for ADD_ONION secret key

Make this a bit more safe with at least type checking of the pointers
depending on the version.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agotest: Add HS_DESC v3 unit tests
David Goulet [Mon, 20 Nov 2017 17:10:07 +0000 (12:10 -0500)] 
test: Add HS_DESC v3 unit tests

This introduces the test_hs_control.c file which at this commit contains basic
unit test for the HS_DESC event.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agocontrol: HSPOST command support for v3
David Goulet [Wed, 15 Nov 2017 19:52:24 +0000 (14:52 -0500)] 
control: HSPOST command support for v3

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agocontrol: Don't check if Server is an HSDir for HSPOST
David Goulet [Wed, 15 Nov 2017 19:37:11 +0000 (14:37 -0500)] 
control: Don't check if Server is an HSDir for HSPOST

This is removed for two reasons. First, HSDir accepts descriptor even though
they don't think they are in fact an HSDir. This is to avoid consensus desync
between client/service and directories.

Second, our malicious HSDir scanner uses the HSPOST command to post on all
relays in order to test them before they could become HSDir. We had to remove
that check from the tor code that the scanner uses.

Thus, this check should not be enforced by the control port for the above use
cases. It is also a bit more complex with v3 support for which not all HSDir
support it so basically irrelevant check.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Add an handler for the HSPOST command
David Goulet [Wed, 15 Nov 2017 19:34:53 +0000 (14:34 -0500)] 
hs-v3: Add an handler for the HSPOST command

It is not used yet at this commit.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Add a public function to upload a descriptor to an HSDir
David Goulet [Wed, 15 Nov 2017 19:01:16 +0000 (14:01 -0500)] 
hs-v3: Add a public function to upload a descriptor to an HSDir

This is groundwork for the HSPOST control port command that needs a way in the
HS subsystem to upload a service descriptor to a specific HSDir.

To do so, we add a public function that takes a series of parameters including
a fully encoded descriptor and initiate a directory request to a specific
routerstatut_t object.

It is for now not used but should be, in future commit, by the HSPOST command.
This commit has no behavior change, only refactoring.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Implement HS_DESC_CONTENT event
David Goulet [Tue, 14 Nov 2017 16:06:35 +0000 (11:06 -0500)] 
hs-v3: Implement HS_DESC_CONTENT event

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agocontrol: Support HS v3 for CIRC and CIRC_MINOR event
David Goulet [Fri, 10 Nov 2017 20:18:35 +0000 (15:18 -0500)] 
control: Support HS v3 for CIRC and CIRC_MINOR event

"REND_QUERY=" can now output a v3 address.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Support HS_DESC UPLOAD failed
David Goulet [Fri, 10 Nov 2017 20:08:05 +0000 (15:08 -0500)] 
hs-v3: Support HS_DESC UPLOAD failed

When failing to upload a descriptor, signal the control port with a FAILED
event.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Implement HS_DESC UPLOADED event
David Goulet [Fri, 10 Nov 2017 20:00:18 +0000 (15:00 -0500)] 
hs-v3: Implement HS_DESC UPLOADED event

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Implement HS_DESC UPLOAD event
David Goulet [Fri, 10 Nov 2017 19:48:52 +0000 (14:48 -0500)] 
hs-v3: Implement HS_DESC UPLOAD event

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Implement HS_DESC CREATED event
David Goulet [Fri, 10 Nov 2017 19:34:41 +0000 (14:34 -0500)] 
hs-v3: Implement HS_DESC CREATED event

This makes the REPLICA= field optional for the control port event. A v2
service will always pass it and v3 is ignored.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Implement HS_DESC RECEIVED event
David Goulet [Fri, 10 Nov 2017 19:12:34 +0000 (14:12 -0500)] 
hs-v3: Implement HS_DESC RECEIVED event

Adds a v3 specific function to handle a received event.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Implement HS_DESC FAILED event
David Goulet [Fri, 10 Nov 2017 19:01:33 +0000 (14:01 -0500)] 
hs-v3: Implement HS_DESC FAILED event

A new v3 specific function has been added named
control_event_hsv3_descriptor_failed().

The HS v3 subsystem now uses it.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Implement HS_DESC REQUESTED event
David Goulet [Fri, 10 Nov 2017 17:07:57 +0000 (12:07 -0500)] 
hs-v3: Implement HS_DESC REQUESTED event

This changes the control_event_hs_descriptor_requested() call to add the hsdir
index optional value. v2 passes NULL all the time.

This commit creates hs_control.{c|h} that contains wrappers for the HS
subsystem to interact with the control port subsystem.

The descriptor REQUESTED event is implemented following proposal 284 extension
for v3.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agocontrol: Rename two HS v2 specific functions
David Goulet [Fri, 10 Nov 2017 16:25:16 +0000 (11:25 -0500)] 
control: Rename two HS v2 specific functions

Make control_event_hs_descriptor_received() and
control_event_hs_descriptor_failed() v2 specific because they take a
rend_data_t object and v3 will need to pass a different object.

No behavior change.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agocontrol: Refactor control_event_hs_descriptor_receive_end
David Goulet [Fri, 10 Nov 2017 16:16:16 +0000 (11:16 -0500)] 
control: Refactor control_event_hs_descriptor_receive_end

First, rename and make that function static because it is internal to
control.c and called by two HS_DESC events.

Second, make it take more basic parameters and thus not a rend_data_t object
so we can still use the function for v3 HS that doesn't use that object.

Third, move the descriptor ID lookup to the two specific events (yes little
code duplication there) because they get a rend_data_t object which won't be
the case for v3.

Finally, through this refactoring, change the pointer check to BUG() and
change some parameter names to reflect what they really are.

No behavior change at this commit.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agocontrol: Refactor HS_DESC events functions to not be v2 specific
David Goulet [Fri, 10 Nov 2017 14:08:05 +0000 (09:08 -0500)] 
control: Refactor HS_DESC events functions to not be v2 specific

This is a naming refactor mostly _except_ for a the events' function that take
a rend_data_t which will require much more refactoring.

No behavior change at this commit, cleanup and renaming stuff to not be only
v2 specific.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Downgrade warning log when an intro circuit has closed
David Goulet [Thu, 9 Nov 2017 19:30:20 +0000 (14:30 -0500)] 
hs-v3: Downgrade warning log when an intro circuit has closed

When an intro circuit has closed, do not warn anymore when we can't find the
service. It is possible to hit that condition if the service is removed before
the circuits were fully closed. This happens in the case of deleting an
ephemeral service.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agohs-v3: Add ephemeral service support
David Goulet [Thu, 9 Nov 2017 19:28:22 +0000 (14:28 -0500)] 
hs-v3: Add ephemeral service support

The functions are now used by the ADD_ONION/DEL_ONION control port command as
well. This commits makes them fully functionnal with hidden service v3.

Part of #20699

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoChange our build process to run Cargo from inside the build tree
Nick Mathewson [Tue, 5 Dec 2017 13:30:26 +0000 (08:30 -0500)] 
Change our build process to run Cargo from inside the build tree

Instead of using the cwd to specify the location of Cargo.toml, we
use the --manifest-path option to specify its location explicitly.

This works around the bug that isis diagnosed on our jenkins builds.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Tue, 5 Dec 2017 17:10:06 +0000 (12:10 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoTweaks to strings in 24500
Nick Mathewson [Tue, 5 Dec 2017 17:09:57 +0000 (12:09 -0500)] 
Tweaks to strings in 24500

8 years agoMake errno error log more useful for getrandom()
Fernando Fernandez Mancera [Mon, 4 Dec 2017 23:17:09 +0000 (00:17 +0100)] 
Make errno error log more useful for getrandom()

Making errno error log more useful for getrandom() call. Adding if statement to
make difference between ENOSYS and other errors.

Fixes #24500

Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
8 years agoMerge branch 'ticket24518'
Nick Mathewson [Mon, 4 Dec 2017 20:56:17 +0000 (15:56 -0500)] 
Merge branch 'ticket24518'

8 years agosched: Set channel scheduler state to IDLE when not opened
David Goulet [Mon, 4 Dec 2017 19:48:15 +0000 (14:48 -0500)] 
sched: Set channel scheduler state to IDLE when not opened

In the KIST main loop, if the channel happens to be not opened, set its state
to IDLE so we can release it properly later on. Prior to this fix, the channel
was in PENDING state, removed from the channel pending list and then kept in
that state because it is not opened.

This bug was introduced in commit dcabf801e52a83e2c3cc23ccc1fa906582a927d6 for
which we made the scheduler loop not consider unopened channel.

This has no consequences on tor except for an annoying but harmless BUG()
warning.

Fixes #24502

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoDon't pass --quiet to cargo for now
Nick Mathewson [Mon, 4 Dec 2017 19:19:22 +0000 (14:19 -0500)] 
Don't pass --quiet to cargo for now

Fixes bug 24518.

8 years agoMerge remote-tracking branch 'isis/bug22907'
Nick Mathewson [Mon, 4 Dec 2017 19:12:03 +0000 (14:12 -0500)] 
Merge remote-tracking branch 'isis/bug22907'

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 4 Dec 2017 19:01:55 +0000 (14:01 -0500)] 
Merge branch 'maint-0.3.2'

8 years agofix check-changes warning
Nick Mathewson [Mon, 4 Dec 2017 19:01:52 +0000 (14:01 -0500)] 
fix check-changes warning

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Mon, 4 Dec 2017 18:23:52 +0000 (13:23 -0500)] 
Merge branch 'maint-0.3.2'

8 years agosched: Downgrade warning log to info in KIST
David Goulet [Mon, 4 Dec 2017 17:22:02 +0000 (12:22 -0500)] 
sched: Downgrade warning log to info in KIST

Some platforms don't have good monotonic time support so don't warn when the
diff between the last run of the scheduler time and now is negative. The
scheduler recovers properly from this so no need to be noisy.

Fixes #23696

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'bug23826-23828_squashed'
Nick Mathewson [Mon, 4 Dec 2017 16:43:11 +0000 (11:43 -0500)] 
Merge branch 'bug23826-23828_squashed'

8 years agoChanges file for #23826, #23828, and #23870
teor [Wed, 25 Oct 2017 02:24:51 +0000 (13:24 +1100)] 
Changes file for #23826, #23828, and #23870

8 years agoDocument the effects of AuthDirHasIPv6Connectivity
teor [Wed, 25 Oct 2017 02:15:35 +0000 (13:15 +1100)] 
Document the effects of AuthDirHasIPv6Connectivity

Fixes #23870 on 0.2.4.1-alpha.

8 years agoSprinkle some consts in networkstatus_getinfo_by_purpose()
teor [Sun, 15 Oct 2017 18:37:32 +0000 (14:37 -0400)] 
Sprinkle some consts in networkstatus_getinfo_by_purpose()

And note where we change the running flag, but probably shouldn't.

Implements ticket 24489.

8 years agoMake set_routerstatus_from_routerinfo() set IPv6 unspecified addresses
teor [Sun, 15 Oct 2017 18:36:06 +0000 (14:36 -0400)] 
Make set_routerstatus_from_routerinfo() set IPv6 unspecified addresses

When creating a routerstatus (vote) from a routerinfo (descriptor),
set the IPv6 address to the unspecified IPv6 address, and explicitly
initialise the port to zero.

Also clarify the documentation for the function.

Fixes bug 24488; bugfix on 0.2.4.1-alpha.

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 1 Dec 2017 17:13:40 +0000 (12:13 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Fri, 1 Dec 2017 17:13:40 +0000 (12:13 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 1 Dec 2017 17:13:40 +0000 (12:13 -0500)] 
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 [Fri, 1 Dec 2017 17:13:40 +0000 (12:13 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Fri, 1 Dec 2017 17:13:40 +0000 (12:13 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Fri, 1 Dec 2017 17:13:39 +0000 (12:13 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoFix a clang compilation warning in rendservice.c
Nick Mathewson [Fri, 1 Dec 2017 17:13:15 +0000 (12:13 -0500)] 
Fix a clang compilation warning in rendservice.c

Fixes bug 24480; bugfix on 0.2.5.16.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Fri, 1 Dec 2017 14:35:36 +0000 (09:35 -0500)] 
Merge branch 'maint-0.3.2'

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 1 Dec 2017 14:35:31 +0000 (09:35 -0500)] 
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 [Fri, 1 Dec 2017 14:35:25 +0000 (09:35 -0500)] 
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 [Fri, 1 Dec 2017 14:35:16 +0000 (09:35 -0500)] 
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 [Fri, 1 Dec 2017 14:35:07 +0000 (09:35 -0500)] 
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 [Fri, 1 Dec 2017 14:34:47 +0000 (09:34 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump.

8 years agobump to 0.3.2.6-alpha-dev
Nick Mathewson [Fri, 1 Dec 2017 14:34:31 +0000 (09:34 -0500)] 
bump to 0.3.2.6-alpha-dev

8 years agobump to 0.3.1.9-dev
Nick Mathewson [Fri, 1 Dec 2017 14:34:20 +0000 (09:34 -0500)] 
bump to 0.3.1.9-dev

8 years agobump to 0.3.0.13-dev
Nick Mathewson [Fri, 1 Dec 2017 14:34:09 +0000 (09:34 -0500)] 
bump to 0.3.0.13-dev

8 years agobump to 0.2.9.14-dev
Nick Mathewson [Fri, 1 Dec 2017 14:34:00 +0000 (09:34 -0500)] 
bump to 0.2.9.14-dev

8 years agobump to 0.2.8.17-dev
Nick Mathewson [Fri, 1 Dec 2017 14:33:51 +0000 (09:33 -0500)] 
bump to 0.2.8.17-dev

8 years agobump to 0.2.5.16-dev
Nick Mathewson [Fri, 1 Dec 2017 14:33:41 +0000 (09:33 -0500)] 
bump to 0.2.5.16-dev

8 years agoforward-port changelogs and releasenotes
Nick Mathewson [Fri, 1 Dec 2017 14:16:15 +0000 (09:16 -0500)] 
forward-port changelogs and releasenotes

8 years agoremove changes files that are going into 0.3.2.6-alpha or earlier.
Nick Mathewson [Thu, 30 Nov 2017 17:31:23 +0000 (12:31 -0500)] 
remove changes files that are going into 0.3.2.6-alpha or earlier.

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 30 Nov 2017 17:26:33 +0000 (12:26 -0500)] 
Merge branch 'maint-0.3.2'

"ours" to avoid version bump.

8 years agobump to 0.3.2.6-alpha
Nick Mathewson [Thu, 30 Nov 2017 17:26:30 +0000 (12:26 -0500)] 
bump to 0.3.2.6-alpha

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 30 Nov 2017 17:25:53 +0000 (12:25 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" to avoid version bumps

8 years agoversion bump to 0.3.1.9
Nick Mathewson [Thu, 30 Nov 2017 17:25:48 +0000 (12:25 -0500)] 
version bump to 0.3.1.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 30 Nov 2017 17:25:07 +0000 (12:25 -0500)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" to avoid version bump.

8 years agoversion bump to 0.3.0.13
Nick Mathewson [Thu, 30 Nov 2017 17:25:01 +0000 (12:25 -0500)] 
version bump to 0.3.0.13

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 30 Nov 2017 17:24:13 +0000 (12:24 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoversion bump to 0.2.9.14
Nick Mathewson [Thu, 30 Nov 2017 17:24:07 +0000 (12:24 -0500)] 
version bump to 0.2.9.14

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 30 Nov 2017 17:22:38 +0000 (12:22 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.

8 years agoversion bump to 0.2.8.17
Nick Mathewson [Thu, 30 Nov 2017 17:22:32 +0000 (12:22 -0500)] 
version bump to 0.2.8.17

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Thu, 30 Nov 2017 17:21:36 +0000 (12:21 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" to avoid version bump

8 years agobump to 0.2.5.16
Nick Mathewson [Thu, 30 Nov 2017 17:19:48 +0000 (12:19 -0500)] 
bump to 0.2.5.16

8 years agoMerge branch 'maint-0.3.2'
Nick Mathewson [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
Merge branch 'maint-0.3.2'

8 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
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 [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
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 [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Thu, 30 Nov 2017 17:07:59 +0000 (12:07 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'trove-2017-012_030' into maint-0.3.0
Nick Mathewson [Thu, 30 Nov 2017 17:07:43 +0000 (12:07 -0500)] 
Merge branch 'trove-2017-012_030' into maint-0.3.0