]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoFix linker errors when building Tor.
Alexander Færøy [Tue, 19 Jun 2018 21:10:12 +0000 (23:10 +0200)] 
Fix linker errors when building Tor.

This patch fixes linking errors when compiling Tor with the dirauth
module disabled.

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

7 years agoRemove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
Nick Mathewson [Mon, 18 Jun 2018 21:03:52 +0000 (17:03 -0400)] 
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a

This was already added to LIBTOR_A_SOURCES; it doesn't need to get
added again.

Fixes bug 26402. Bugfix on 0.3.4.1-alpha.

7 years agoRevert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"
Nick Mathewson [Mon, 18 Jun 2018 21:06:18 +0000 (17:06 -0400)] 
Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"

This reverts commit 70d91bd059869a0ecf24ceb66942ada4f66f03c9.

7 years agoRemove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
Nick Mathewson [Mon, 18 Jun 2018 21:03:52 +0000 (17:03 -0400)] 
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a

This was already added to LIBTOR_A_SOURCES; it doesn't need to get
added again.

Fixes bug 26402. Bugfix on 0.3.4.1-alpha.

7 years agoMerge branch 'rust_rand_tests' into maint-0.3.4
Nick Mathewson [Mon, 18 Jun 2018 17:10:24 +0000 (13:10 -0400)] 
Merge branch 'rust_rand_tests' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -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 [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -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 [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -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 [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoAdd .editorconfig to follow coding standards style
juga0 [Sun, 3 Jun 2018 10:44:02 +0000 (10:44 +0000)] 
Add .editorconfig to follow coding standards style

7 years agoChanges to make the rust crypto::mod tests compile
Nick Mathewson [Sat, 16 Jun 2018 17:22:44 +0000 (13:22 -0400)] 
Changes to make the rust crypto::mod tests compile

The digest tests don't link yet, though.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sat, 16 Jun 2018 17:10:19 +0000 (13:10 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoFix a bug in my fix for #26258
Nick Mathewson [Sat, 16 Jun 2018 17:08:40 +0000 (13:08 -0400)] 
Fix a bug in my fix for #26258

The fix here is use a different bourne shell subsitution for
CARGO_ONLINE, so that an empty string counts as set.

7 years agoMerge remote-tracking branch 'isis/bug26267' into maint-0.3.4
Nick Mathewson [Sat, 16 Jun 2018 16:43:28 +0000 (12:43 -0400)] 
Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4

7 years agoChanges file for rust fatal warnings
Nick Mathewson [Sat, 16 Jun 2018 14:20:21 +0000 (10:20 -0400)] 
Changes file for rust fatal warnings

7 years agoMerge remote-tracking branch 'isis/bug26245' into maint-0.3.4
Nick Mathewson [Sat, 16 Jun 2018 14:19:26 +0000 (10:19 -0400)] 
Merge remote-tracking branch 'isis/bug26245' into maint-0.3.4

7 years agorust: Remove unused N_DIGEST_ALGORITHMS constant from crypto_digest.rs.
Isis Lovecruft [Fri, 15 Jun 2018 23:22:43 +0000 (23:22 +0000)] 
rust: Remove unused N_DIGEST_ALGORITHMS constant from crypto_digest.rs.

In the C code, this constant is only ever used in src/test/bench.c.

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

7 years agorust: Add comment and pragma on "unused" smartlist_t type.
Isis Lovecruft [Fri, 15 Jun 2018 22:49:05 +0000 (22:49 +0000)] 
rust: Add comment and pragma on "unused" smartlist_t type.

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

7 years agoMake Rust warnings conditionally fatal
Taylor Yu [Fri, 15 Jun 2018 22:27:19 +0000 (17:27 -0500)] 
Make Rust warnings conditionally fatal

Set rustc flags to treat warnings as fatal if configured with
--enable-warnings.

7 years agorust: Expose rand module from crypto crate.
Isis Lovecruft [Fri, 15 Jun 2018 21:44:22 +0000 (21:44 +0000)] 
rust: Expose rand module from crypto crate.

7 years agoBump master to 0.3.5.0-alpha-dev tor-0.3.5.0-alpha-dev
Nick Mathewson [Fri, 15 Jun 2018 21:19:49 +0000 (17:19 -0400)] 
Bump master to 0.3.5.0-alpha-dev

7 years agoSet default-features = false for rand_core
Taylor Yu [Fri, 15 Jun 2018 20:19:16 +0000 (15:19 -0500)] 
Set default-features = false for rand_core

Apparently rand and rand_core need to be built with the "std" feature
set consistently, or there will be a compile error in rngs/jitter.rs.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 14 Jun 2018 16:49:57 +0000 (12:49 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
Nick Mathewson [Thu, 14 Jun 2018 16:47:09 +0000 (12:47 -0400)] 
Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3

7 years agosquash! Make sure that the test_rust.sh script fails when a test fails
Nick Mathewson [Wed, 13 Jun 2018 16:21:25 +0000 (12:21 -0400)] 
squash! Make sure that the test_rust.sh script fails when a test fails

Also make sure that we're actually running the test from within the right
cwd, like we do when we're building.  This seems necessary to avoid
an error when running offline.

Amusingly, it appears that we had this bug before: we just weren't
noticing it, because of bug 26258.

7 years agoMerge remote-tracking branch 'asn-github/bug26358'
Nick Mathewson [Wed, 13 Jun 2018 14:00:37 +0000 (10:00 -0400)] 
Merge remote-tracking branch 'asn-github/bug26358'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 13 Jun 2018 13:59:28 +0000 (09:59 -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 [Wed, 13 Jun 2018 13:59:28 +0000 (09:59 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 13 Jun 2018 13:59:28 +0000 (09:59 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoFix an extra space in a changes file
Nick Mathewson [Wed, 13 Jun 2018 13:59:26 +0000 (09:59 -0400)] 
Fix an extra space in a changes file

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 13 Jun 2018 13:58:05 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 13 Jun 2018 13:58:05 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 13 Jun 2018 13:58:04 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'bug26158_031' into maint-0.3.1
Nick Mathewson [Wed, 13 Jun 2018 13:58:01 +0000 (09:58 -0400)] 
Merge branch 'bug26158_031' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 13 Jun 2018 13:57:10 +0000 (09:57 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 13 Jun 2018 13:57:10 +0000 (09:57 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'bug25686_diagnostic_032' into maint-0.3.2
Nick Mathewson [Wed, 13 Jun 2018 13:56:17 +0000 (09:56 -0400)] 
Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

7 years agoMerge remote-tracking branch 'rl1987/bug24891'
Nick Mathewson [Wed, 13 Jun 2018 13:46:50 +0000 (09:46 -0400)] 
Merge remote-tracking branch 'rl1987/bug24891'

7 years agoSilence warning of relaycell/circbw tst.
George Kadianakis [Wed, 13 Jun 2018 11:14:17 +0000 (14:14 +0300)] 
Silence warning of relaycell/circbw tst.

Shouldn't send RELAY_COMMAND_DATA cell with 0 stream id.

7 years agocopy 0.3.3.7 changelog forward to master
Nick Mathewson [Tue, 12 Jun 2018 16:06:26 +0000 (12:06 -0400)] 
copy 0.3.3.7 changelog forward to master

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 12 Jun 2018 16:05:18 +0000 (12:05 -0400)] 
Merge branch 'maint-0.3.3'

"ours" to avoid version bump.

7 years agobump to 0.3.3.7-dev
Nick Mathewson [Tue, 12 Jun 2018 16:05:09 +0000 (12:05 -0400)] 
bump to 0.3.3.7-dev

7 years agobump to 0.3.4.2-alpha-dev
Nick Mathewson [Tue, 12 Jun 2018 16:04:58 +0000 (12:04 -0400)] 
bump to 0.3.4.2-alpha-dev

7 years agoFold in changelog entry. tor-0.3.4.2-alpha
Nick Mathewson [Tue, 12 Jun 2018 13:47:07 +0000 (09:47 -0400)] 
Fold in changelog entry.

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Tue, 12 Jun 2018 13:44:17 +0000 (09:44 -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 [Tue, 12 Jun 2018 13:44:17 +0000 (09:44 -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 [Tue, 12 Jun 2018 13:44:17 +0000 (09:44 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 12 Jun 2018 13:44:17 +0000 (09:44 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'dannenberg_ipv6_029' into maint-0.2.9
Nick Mathewson [Tue, 12 Jun 2018 13:44:13 +0000 (09:44 -0400)] 
Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

7 years agoAdd a changelog entry.
Linus Nordberg [Sun, 10 Jun 2018 11:09:38 +0000 (13:09 +0200)] 
Add a changelog entry.

7 years agoAdd IPv6 orport address for dannenberg.
Linus Nordberg [Sun, 10 Jun 2018 09:07:00 +0000 (11:07 +0200)] 
Add IPv6 orport address for dannenberg.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 12 Jun 2018 12:57:25 +0000 (08:57 -0400)] 
Merge branch 'maint-0.3.3'

"ours" merge to avoid version bump.

7 years agoBump to 0.3.3.7
Nick Mathewson [Tue, 12 Jun 2018 12:57:09 +0000 (08:57 -0400)] 
Bump to 0.3.3.7

7 years agoRemove folded-in changes files
Nick Mathewson [Tue, 12 Jun 2018 12:56:28 +0000 (08:56 -0400)] 
Remove folded-in changes files

7 years agoLightly edit changelog
Nick Mathewson [Tue, 12 Jun 2018 12:46:35 +0000 (08:46 -0400)] 
Lightly edit changelog

Remove the "documentation" section, since a comment-only change
doesn't usually get a changelog entry.

7 years agoformat changelog.
Nick Mathewson [Tue, 12 Jun 2018 12:36:48 +0000 (08:36 -0400)] 
format changelog.

7 years agoadd more entries to changelog
Nick Mathewson [Tue, 12 Jun 2018 12:36:28 +0000 (08:36 -0400)] 
add more entries to changelog

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 12 Jun 2018 12:18:57 +0000 (08:18 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 12 Jun 2018 12:18:56 +0000 (08:18 -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 [Tue, 12 Jun 2018 12:18:56 +0000 (08:18 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1
Nick Mathewson [Tue, 12 Jun 2018 12:18:53 +0000 (08:18 -0400)] 
Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

7 years agoMerge remote-tracking branch 'rl1987/bug26283'
Nick Mathewson [Tue, 12 Jun 2018 12:17:48 +0000 (08:17 -0400)] 
Merge remote-tracking branch 'rl1987/bug26283'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 12 Jun 2018 12:11:20 +0000 (08:11 -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 [Tue, 12 Jun 2018 12:11:20 +0000 (08:11 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 12 Jun 2018 12:11:20 +0000 (08:11 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Tue, 12 Jun 2018 12:11:19 +0000 (08:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agobump to 0.3.4.2-alpha
Nick Mathewson [Mon, 11 Jun 2018 20:49:09 +0000 (16:49 -0400)] 
bump to 0.3.4.2-alpha

7 years agostart the 0.3.4.2-alpha changelog
Nick Mathewson [Mon, 11 Jun 2018 20:37:08 +0000 (16:37 -0400)] 
start the 0.3.4.2-alpha changelog

7 years agoSeveral attempts to diagnose ticket 25686
Nick Mathewson [Mon, 11 Jun 2018 20:14:57 +0000 (16:14 -0400)] 
Several attempts to diagnose ticket 25686

There are a few reasons that relays might be uploading desciptors
without saying X-Desc-Gen-Reason:
  1. They are running an old version of our software, before 0.3.2.stable.
  2. They are not running our software, but they are claiming they
     are.
  3. They are uploading through a proxy that strips X-Desc-Gen-Reason.
  4. They somehow had a bug in their software.

According to the 25686 data, 1 is the most common reason.  This
ticket is an attempt to diagnose case 4, or prove that case 4
doesn't actually happen.

7 years agoUpdate geoip and geoip6 to the June 7 2018 database.
Karsten Loesing [Mon, 11 Jun 2018 19:58:55 +0000 (21:58 +0200)] 
Update geoip and geoip6 to the June 7 2018 database.

7 years agoMerge remote-tracking branch 'mikeperry-github/bug26259'
Nick Mathewson [Fri, 8 Jun 2018 14:17:00 +0000 (10:17 -0400)] 
Merge remote-tracking branch 'mikeperry-github/bug26259'

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 8 Jun 2018 14:12:57 +0000 (10:12 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Fri, 8 Jun 2018 14:12:57 +0000 (10:12 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 8 Jun 2018 14:11:57 +0000 (10:11 -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 [Fri, 8 Jun 2018 14:11:57 +0000 (10:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Fri, 8 Jun 2018 14:11:57 +0000 (10:11 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 8 Jun 2018 14:11:57 +0000 (10:11 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoAvoid out-of-bounds smartlist access in protover_compute_vote()
rl1987 [Mon, 4 Jun 2018 09:27:10 +0000 (12:27 +0300)] 
Avoid out-of-bounds smartlist access in protover_compute_vote()
and contract_protocol_list()

7 years agoSilence -Wbad-function-cast warning (when DEBUG_SMARTLIST is on)
rl1987 [Sun, 3 Jun 2018 13:45:09 +0000 (16:45 +0300)] 
Silence -Wbad-function-cast warning (when DEBUG_SMARTLIST is on)

7 years agoSilence unused-const-variable warnings in zstd.h on some gcc versions
teor [Sat, 2 Jun 2018 21:08:01 +0000 (14:08 -0700)] 
Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.

7 years agoMerge remote-tracking branch 'rl1987/doc25237'
Nick Mathewson [Sat, 2 Jun 2018 18:35:06 +0000 (11:35 -0700)] 
Merge remote-tracking branch 'rl1987/doc25237'

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Sat, 2 Jun 2018 17:36:49 +0000 (10:36 -0700)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'bug26121-033-squashed' into maint-0.3.3
Nick Mathewson [Sat, 2 Jun 2018 17:36:44 +0000 (10:36 -0700)] 
Merge branch 'bug26121-033-squashed' into maint-0.3.3

7 years agoBug 26121: Improve BUILDTIMEOUT_SET accuracy.
Mike Perry [Wed, 16 May 2018 06:42:41 +0000 (06:42 +0000)] 
Bug 26121: Improve BUILDTIMEOUT_SET accuracy.

We were miscounting the total number of circuits for the TIMEOUT_RATE and
CLOSE_RATE fields of this event.

7 years agoMerge branch 'bug25939_034_01_squashed'
Nick Mathewson [Sat, 2 Jun 2018 17:33:33 +0000 (10:33 -0700)] 
Merge branch 'bug25939_034_01_squashed'

7 years agohs-v3: Build onion address before registering ephemeral service
David Goulet [Wed, 23 May 2018 15:49:02 +0000 (11:49 -0400)] 
hs-v3: Build onion address before registering ephemeral service

With the work on #25500 (reducing CPU client usage), the HS service main loop
callback is enabled as soon as the HS service map changes which happens when
registering a new service.

Unfortunately, for an ephemeral service, we were building the onion address
*after* the registration leading to the "service->onion_address` to be an
empty string.

This broke the "HS_DESC CREATED" event which had no onion address in it. And
also, we were logging an empty onion address for that service.

Fixes #25939

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoHeed --disable-unittests properly
rl1987 [Sat, 2 Jun 2018 09:53:04 +0000 (12:53 +0300)] 
Heed --disable-unittests properly

7 years agoPoint reader to a section in tor-spec.txt
rl1987 [Sat, 2 Jun 2018 08:15:10 +0000 (11:15 +0300)] 
Point reader to a section in tor-spec.txt

7 years agoBug 26259: Changes file.
Mike Perry [Fri, 1 Jun 2018 00:24:00 +0000 (00:24 +0000)] 
Bug 26259: Changes file.

7 years agoBug 26259: Don't count 0-length RELAY_COMMAND_DATA in CIRC_BW OVERHEAD
Mike Perry [Fri, 1 Jun 2018 00:23:08 +0000 (00:23 +0000)] 
Bug 26259: Don't count 0-length RELAY_COMMAND_DATA in CIRC_BW OVERHEAD

This cell should be treated as invalid for purposes of CIRC_BW.

7 years agoMake sure that the test_rust.sh script fails when a test fails
Nick Mathewson [Fri, 1 Jun 2018 00:15:57 +0000 (17:15 -0700)] 
Make sure that the test_rust.sh script fails when a test fails

Exit codes from find(1) seem not to be so reliable as we had hoped.

Closes ticket 26258; bugfix on 0.3.3.4-alpha when we fixed #25560

7 years agoFix various typos
Nick Mathewson [Wed, 30 May 2018 14:57:22 +0000 (07:57 -0700)] 
Fix various typos

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Sun, 27 May 2018 14:04:42 +0000 (10:04 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
Nick Mathewson [Sun, 27 May 2018 14:03:11 +0000 (10:03 -0400)] 
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3

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

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 24 May 2018 13:40:06 +0000 (09:40 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 24 May 2018 13:40:06 +0000 (09:40 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'bug26116_033' into maint-0.3.3
Nick Mathewson [Thu, 24 May 2018 13:40:00 +0000 (09:40 -0400)] 
Merge branch 'bug26116_033' into maint-0.3.3

7 years agoMerge branch 'bug26116_029' into maint-0.2.9
Nick Mathewson [Thu, 24 May 2018 13:39:46 +0000 (09:39 -0400)] 
Merge branch 'bug26116_029' into maint-0.2.9