]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 21 Jun 2018 12:54:02 +0000 (08:54 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoFix changes file for memory leak.
Nick Mathewson [Thu, 21 Jun 2018 12:53:37 +0000 (08:53 -0400)] 
Fix changes file for memory leak.

7 years agoMerge branch 'additional_rust_test_fixes' into maint-0.3.4
Nick Mathewson [Thu, 21 Jun 2018 12:38:17 +0000 (08:38 -0400)] 
Merge branch 'additional_rust_test_fixes' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 21 Jun 2018 12:36:48 +0000 (08:36 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'catalyst-github/allow_fail_rust' into maint-0.3.4
Nick Mathewson [Thu, 21 Jun 2018 00:00:56 +0000 (20:00 -0400)] 
Merge remote-tracking branch 'catalyst-github/allow_fail_rust' into maint-0.3.4

7 years agofix memory leak in protover.c
Roger Dingledine [Wed, 20 Jun 2018 23:43:58 +0000 (19:43 -0400)] 
fix memory leak in protover.c

Fix a memory leak where directory authorities would leak a chunk of
memory for every router descriptor every time they considered voting.

This bug was taking down directory authorities in the live network due
to out-of-memory issues.

Fixes bug 26435; bugfix on 0.3.3.6.

7 years agoadd build.rs to EXTRA_DIST
Nick Mathewson [Wed, 20 Jun 2018 23:32:01 +0000 (19:32 -0400)] 
add build.rs to EXTRA_DIST

7 years agoAllow spaces in CCLD in linker.sh
Nick Mathewson [Wed, 20 Jun 2018 23:16:25 +0000 (19:16 -0400)] 
Allow spaces in CCLD in linker.sh

Hello71 spotted this first.

7 years agoeol@eof is still the law in 0.3.4 :(
Nick Mathewson [Wed, 20 Jun 2018 23:05:11 +0000 (19:05 -0400)] 
eol@eof is still the law in 0.3.4 :(

7 years agoAdd a leak suppression for backtrace_alloc
Nick Mathewson [Wed, 20 Jun 2018 22:02:49 +0000 (18:02 -0400)] 
Add a leak suppression for backtrace_alloc

This appears to be an internal rust thing: I don't know why it's
leaking.  We should investigate further.

7 years agoMerge branch 'maint-0.3.4' into additional_rust_test_fixes
Nick Mathewson [Wed, 20 Jun 2018 21:53:51 +0000 (17:53 -0400)] 
Merge branch 'maint-0.3.4' into additional_rust_test_fixes

7 years agoUse different RUST_LINKER_OPTIONS for sanitizers
Nick Mathewson [Wed, 20 Jun 2018 21:53:09 +0000 (17:53 -0400)] 
Use different RUST_LINKER_OPTIONS for sanitizers

These appear to work for me.

7 years agoFix clang warnings introduced by 9f2b887c5d251b93ee9def708
Nick Mathewson [Wed, 20 Jun 2018 21:49:06 +0000 (17:49 -0400)] 
Fix clang warnings introduced by 9f2b887c5d251b93ee9def708

7 years agoFix memory leak in CryptoDigest type
Nick Mathewson [Wed, 20 Jun 2018 21:28:28 +0000 (17:28 -0400)] 
Fix memory leak in CryptoDigest type

If you're owning a C pointer, you need to implement Drop.

7 years agoDisable doctests in src/rust/crypto module.
Nick Mathewson [Wed, 20 Jun 2018 21:16:44 +0000 (17:16 -0400)] 
Disable doctests in src/rust/crypto module.

These all need C linking to work, and so far, rustdoc does not seem
to respect cargo setting about build scripts or RUSTOPTIONS.

7 years agoFix bugs in rust digest tests
Nick Mathewson [Wed, 20 Jun 2018 21:08:00 +0000 (17:08 -0400)] 
Fix bugs in rust digest tests

7 years agoMerge branch 'rust_build_script_v3' into additional_rust_test_fixes
Nick Mathewson [Wed, 20 Jun 2018 21:07:47 +0000 (17:07 -0400)] 
Merge branch 'rust_build_script_v3' into additional_rust_test_fixes

7 years agorust: Remove --all-features flag from `cargo test` call in test_rust.sh.
Isis Lovecruft [Mon, 18 Jun 2018 18:37:07 +0000 (18:37 +0000)] 
rust: Remove --all-features flag from `cargo test` call in test_rust.sh.

We'd like to feature gate code that calls C from Rust, as a workaround
to several linker issues when running `cargo test` (#25386), and we
can't feature gate anything out of test code if `cargo test` is called
with `--all-features`.

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

7 years agoAllow Rust to fail for now
Taylor Yu [Wed, 20 Jun 2018 20:10:18 +0000 (15:10 -0500)] 
Allow Rust to fail for now

Multiple issues are preventing Travis CI from passing with Rust right
now.

7 years agoeol@eof in test-dir.c
Nick Mathewson [Wed, 20 Jun 2018 12:29:38 +0000 (08:29 -0400)] 
eol@eof in test-dir.c

7 years agoMerge branch 'asn_bug24977_final_squashed' into maint-0.3.4
Nick Mathewson [Wed, 20 Jun 2018 12:02:27 +0000 (08:02 -0400)] 
Merge branch 'asn_bug24977_final_squashed' into maint-0.3.4

7 years agoAdd changes file for #24977.
George Kadianakis [Wed, 13 Jun 2018 10:47:36 +0000 (13:47 +0300)] 
Add changes file for #24977.

7 years agoRecreate nodelist before use if it's outdated.
George Kadianakis [Wed, 13 Jun 2018 10:28:39 +0000 (13:28 +0300)] 
Recreate nodelist before use if it's outdated.

We currently only do the check when we are about to use the HSDir indices.

7 years agoRecreate voting schedule before use if it's outdated.
George Kadianakis [Tue, 12 Jun 2018 11:29:06 +0000 (14:29 +0300)] 
Recreate voting schedule before use if it's outdated.

7 years agorust: Remove redundant "testing" feature from tor_log crate.
Isis Lovecruft [Mon, 18 Jun 2018 18:33:49 +0000 (18:33 +0000)] 
rust: Remove redundant "testing" feature from tor_log crate.

It was synonymous with the builtin "test" feature.

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

7 years agoMerge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4
Nick Mathewson [Wed, 20 Jun 2018 11:50:00 +0000 (07:50 -0400)] 
Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4

7 years agoAdd changes file
rl1987 [Sun, 3 Jun 2018 11:56:28 +0000 (14:56 +0300)] 
Add changes file

7 years agoEnable DEBUG_SMARTLIST for entire codebase when expensive hardening is on
rl1987 [Sun, 3 Jun 2018 11:48:20 +0000 (14:48 +0300)] 
Enable DEBUG_SMARTLIST for entire codebase when expensive hardening is on

7 years agoEnable DEBUG_SMARTLIST in unit tests
rl1987 [Sun, 3 Jun 2018 11:33:31 +0000 (14:33 +0300)] 
Enable DEBUG_SMARTLIST in unit tests

7 years agoRefrain from accessing empty smartlist in test_bridges_clear_bridge_list
rl1987 [Sun, 3 Jun 2018 10:34:24 +0000 (13:34 +0300)] 
Refrain from accessing empty smartlist in test_bridges_clear_bridge_list

Just check that smartlist length is zero instead

7 years agoMerge remote-tracking branch 'catalyst-github/bug26415_034' into maint-0.3.4
Nick Mathewson [Wed, 20 Jun 2018 11:35:13 +0000 (07:35 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug26415_034' into maint-0.3.4

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 agoFix compilation of Rust crypto doctests
Taylor Yu [Mon, 18 Jun 2018 18:41:38 +0000 (13:41 -0500)] 
Fix compilation of Rust crypto doctests

The doctests for src/rust/crypto don't compile for multiple reasons,
including some missing exports and incorrect identifier paths.  Fixes
bug 26415; bugfix on 0.3.4.1-alpha.

7 years agoUse a rust build script to set linker options correctly for tests.
Nick Mathewson [Mon, 18 Jun 2018 21:08:23 +0000 (17:08 -0400)] 
Use a rust build script to set linker options correctly for tests.

We need this trick because some of our Rust tests depend on our C
code, which in turn depend on other native libraries, which thereby
pulls a whole mess of our build system into "cargo test".

To solve this, we add a build script (build.rs) to set most of the
options that we want based on the contents of config.rust.  Some
options can't be set, and need to go to the linker directly: we use
a linker replacement (link_rust.sh) for these.  Both config.rust and
link_rust.sh are generated by autoconf for us.

This patch on its own should enough to make the crypto test build,
but not necessarily enough to make it pass.

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.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.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.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 agoRequire live consensus to compute responsible HSDirs.
George Kadianakis [Wed, 13 Jun 2018 10:27:00 +0000 (13:27 +0300)] 
Require live consensus to compute responsible HSDirs.

Here is how this changes the HSv3 client-side and service-side:

For service side we already required live consensus to upload descriptors (see
9e900d1db7c8c9e164b5b14d5cdd4099c1ce45f0) so we should never get there without
a live consensus.

For the client-side we now require a live consensus to attempt to connect to
HS.  While this changes the client behavior in principle, it doesn't really
change it, because we always required live consensus to set HSDir indices, so
before this patch a client with no live consensus would try to compute
responsible HSDirs without any HSDir indices and bug out. This makes the client
behavior more consistent, by requiring a live consensus (and hence a
semi-synced clock) for the client to connect to an HS entirely.

The alternative would have been to allow setting HSDir indices with a non-live
consensus, but this would cause the various problems outlined by commit
b89d2fa1db2379bffd2e2b4c851c3facc57b6ed8.

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