]> 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 [Mon, 15 Oct 2018 16:52:54 +0000 (12:52 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoFix another tor_assert(0) case
Nick Mathewson [Mon, 15 Oct 2018 16:52:48 +0000 (12:52 -0400)] 
Fix another tor_assert(0) case

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 15 Oct 2018 16:47:46 +0000 (12:47 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Mon, 15 Oct 2018 16:47:46 +0000 (12:47 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoFix make check-spaces.
Nick Mathewson [Mon, 15 Oct 2018 16:47:19 +0000 (12:47 -0400)] 
Fix make check-spaces.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 15 Oct 2018 14:48:35 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoAdjust tor_assert_unreached()
Nick Mathewson [Mon, 15 Oct 2018 14:46:24 +0000 (10:46 -0400)] 
Adjust tor_assert_unreached()

This version of the macro makes it obvious to the compiler that
"tor_assert_unreached()" will always abort().

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 15 Oct 2018 14:37:52 +0000 (10:37 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Mon, 15 Oct 2018 14:37:49 +0000 (10:37 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoMerge branch 'bug27709_029' into maint-0.2.9
Nick Mathewson [Mon, 15 Oct 2018 14:34:39 +0000 (10:34 -0400)] 
Merge branch 'bug27709_029' into maint-0.2.9

7 years agoExplain a bit more about branch prediction in the unit-test case
Nick Mathewson [Mon, 15 Oct 2018 14:16:34 +0000 (10:16 -0400)] 
Explain a bit more about branch prediction in the unit-test case

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 10 Oct 2018 21:12:34 +0000 (17:12 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Wed, 10 Oct 2018 21:12:34 +0000 (17:12 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoMerge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
Nick Mathewson [Wed, 10 Oct 2018 21:12:11 +0000 (17:12 -0400)] 
Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9

7 years agoMerge branch 'bug27738-033' into bug27738-034
Taylor Yu [Wed, 10 Oct 2018 20:13:02 +0000 (15:13 -0500)] 
Merge branch 'bug27738-033' into bug27738-034

7 years agoMerge remote-tracking branch 'teor/bug27738-032' into bug27738-033
Taylor Yu [Wed, 10 Oct 2018 20:01:59 +0000 (15:01 -0500)] 
Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033

7 years agoMerge branch 'appveyor_pacman_fixes_034' into maint-0.3.4
Nick Mathewson [Wed, 10 Oct 2018 18:27:24 +0000 (14:27 -0400)] 
Merge branch 'appveyor_pacman_fixes_034' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 10 Oct 2018 15:34:49 +0000 (11:34 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Wed, 10 Oct 2018 15:34:48 +0000 (11:34 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoUpdate geoip and geoip6 to the October 9 2018 database.
Karsten Loesing [Wed, 10 Oct 2018 15:26:41 +0000 (17:26 +0200)] 
Update geoip and geoip6 to the October 9 2018 database.

7 years agofixup! Changes file for apveyor changes
Nick Mathewson [Wed, 10 Oct 2018 15:10:29 +0000 (11:10 -0400)] 
fixup! Changes file for apveyor changes

7 years agoChanges file for apveyor changes
Nick Mathewson [Wed, 10 Oct 2018 14:20:01 +0000 (10:20 -0400)] 
Changes file for apveyor changes

7 years agoAppveyor: Don't try to install the mingw openssl package
Nick Mathewson [Wed, 10 Oct 2018 13:49:02 +0000 (09:49 -0400)] 
Appveyor: Don't try to install the mingw openssl package

This package conflicts with a preinstalled mingw openssl.

Fixes bug 27943. I think this was an appveyor change, not a Tor bug.

7 years agoInstall only one of the two mingw architectures in appveyor
Nick Mathewson [Wed, 10 Oct 2018 13:44:36 +0000 (09:44 -0400)] 
Install only one of the two mingw architectures in appveyor

Closes ticket 27765

This commit also changes the appveyor file to a unified line ending
style, since the old one was pretty confused.  Use "-b" to see the
real differences.

7 years agoFix the 0.3.4 part of bug 27781 (arm compilation)
Nick Mathewson [Mon, 24 Sep 2018 15:08:27 +0000 (11:08 -0400)] 
Fix the 0.3.4 part of bug 27781 (arm compilation)

Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we
need to include crypto_util.h here.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 21 Sep 2018 13:35:54 +0000 (09:35 -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 [Fri, 21 Sep 2018 13:35:51 +0000 (09:35 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2 maint-0.3.2
Nick Mathewson [Fri, 21 Sep 2018 13:35:23 +0000 (09:35 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'github/bug27139_034' into maint-0.3.4
Nick Mathewson [Thu, 20 Sep 2018 14:43:05 +0000 (10:43 -0400)] 
Merge remote-tracking branch 'github/bug27139_034' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 18 Sep 2018 12:31:14 +0000 (08:31 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3
Nick Mathewson [Tue, 18 Sep 2018 12:31:08 +0000 (08:31 -0400)] 
Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3

7 years agoTravis: use the Homebrew addon for xz and zstd
teor [Tue, 18 Sep 2018 09:36:28 +0000 (19:36 +1000)] 
Travis: use the Homebrew addon for xz and zstd

xz and zstd were added as optional dependencies in 0.3.1.1-alpha.

Implements ticket 27738.

7 years agoMerge branch 'bug27738-029' into bug27738-032
teor [Tue, 18 Sep 2018 09:34:53 +0000 (19:34 +1000)] 
Merge branch 'bug27738-029' into bug27738-032

Resolve conflicts due to modified comments, and deleted lines.

7 years agoTravis: use the Homebrew addon
teor [Tue, 18 Sep 2018 09:26:54 +0000 (19:26 +1000)] 
Travis: use the Homebrew addon

Use the Travis Homebrew addon to install packages on macOS. The package
list is the same, but the Homebrew addon does not do a `brew update` by
default.

This makes builds faster, at the cost of using slightly older packages.

Implements ticket 27738.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 14 Sep 2018 16:56:30 +0000 (12:56 -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 [Fri, 14 Sep 2018 16:56:30 +0000 (12:56 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agohs-v3: Don't BUG() on directory permission check failure
David Goulet [Fri, 14 Sep 2018 14:56:34 +0000 (10:56 -0400)] 
hs-v3: Don't BUG() on directory permission check failure

In hs_config.c, we do validate the permission of the hidden service directory
but we do not try to create it. So, in the event that the directory doesn't
exists, we end up in the loading key code path which checks for the
permission and possibly creates the directory. On failure, don't BUG() since
there is a perfectly valid use case for that function to fail.

Fixes #27335

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoRevise our assertion and bug macros to work with -Wparentheses
Nick Mathewson [Fri, 14 Sep 2018 15:39:37 +0000 (11:39 -0400)] 
Revise our assertion and bug macros to work with -Wparentheses

On GCC and Clang, there's a feature to warn you about bad
conditionals like "if (a = b)", which should be "if (a == b)".
However, they don't warn you if there are extra parentheses around
"a = b".

Unfortunately, the tor_assert() macro and all of its kin have been
passing their inputs through stuff like PREDICT_UNLIKELY(expr) or
PREDICT_UNLIKELY(!(expr)), both of which expand to stuff with more
parentheses around "expr", thus suppressing these warnings.

To fix this, this patch introduces new macros that do not wrap
expr.  They're only used when GCC or Clang is enabled (both define
__GNUC__), since they require GCC's "({statement expression})"
syntax extension.  They're only used when we're building the
unit-test variant of the object files, since they suppress the
branch-prediction hints.

I've confirmed that tor_assert(), tor_assert_nonfatal(),
tor_assert_nonfatal_once(), BUG(), and IF_BUG_ONCE() all now give
compiler warnings when their argument is an assignment expression.

Fixes bug 27709.

Bugfix on 0.0.6, where we first introduced the "tor_assert()" macro.

7 years agorust/protover: delete ProtoSet::retain
cypherpunks [Wed, 15 Aug 2018 03:23:08 +0000 (03:23 +0000)] 
rust/protover: delete ProtoSet::retain

As the comment noted, it was horribly inefficient.

7 years agorust/protover: use .and_not_in() instead of .retain() in all_supported()
cypherpunks [Thu, 9 Aug 2018 21:26:10 +0000 (21:26 +0000)] 
rust/protover: use .and_not_in() instead of .retain() in all_supported()

.retain() would allocating a Vec of billions of integers and check them
one at a time to separate the supported versions from the unsupported.
This leads to a memory DoS.

Closes ticket 27206. Bugfix on e6625113c98c281b0a649598d7daa347c28915e9.

7 years agorust/protover: add ProtoSet::and_not_in()
cypherpunks [Thu, 9 Aug 2018 21:25:18 +0000 (21:25 +0000)] 
rust/protover: add ProtoSet::and_not_in()

This is a way more efficient version of retain().

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 14 Sep 2018 14:48:01 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoIf options_act() fails, restore the previous value of global_options
Nick Mathewson [Fri, 14 Sep 2018 14:34:45 +0000 (10:34 -0400)] 
If options_act() fails, restore the previous value of global_options

Before 0.3.3.1-alpha, we would exit() in this case immediately.  But
now that we leave tor_main() more conventionally, we need to make
sure we restore things so as not to cause a double free.

Fixes bug 27708; bugfix on 0.3.3.1-alpha.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 14 Sep 2018 13:25:34 +0000 (09:25 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoChanges file for the 32-bit msec conversion fixes of #27139
Nick Mathewson [Fri, 14 Sep 2018 12:49:27 +0000 (08:49 -0400)] 
Changes file for the 32-bit msec conversion fixes of #27139

7 years agoMake circuitmux ewma timing test more tolerant on 32bit osx
Nick Mathewson [Fri, 14 Sep 2018 12:40:10 +0000 (08:40 -0400)] 
Make circuitmux ewma timing test more tolerant on 32bit osx

Since we use a 32-bit approximation for millisecond conversion here,
we can't expect so much precision.

Fixes part of bug 27139; bugfix on 0.3.4.1-alpha.

7 years agoAvoid integer overflow on fast 32-bit millisecond conversion.
Nick Mathewson [Fri, 14 Sep 2018 12:36:33 +0000 (08:36 -0400)] 
Avoid integer overflow on fast 32-bit millisecond conversion.

Multiply-then-divide is more accurate, but it runs into trouble when
our input is above INT32_MAX/numerator.  So when our value is too
large, do divide-then-multiply instead.

Fixes part of bug 27139; bugfix on 0.3.4.1-alpha.

7 years agoUse a slightly more accurate formula for OSX 32-bit msec conversion
Nick Mathewson [Fri, 14 Sep 2018 12:30:24 +0000 (08:30 -0400)] 
Use a slightly more accurate formula for OSX 32-bit msec conversion

We use an optimized but less accurate formula for converting coarse
time differences to milliseconds on 32-bit OSX platforms, so that we
can avoid 64-bit division.

The old numbers were off by 0.4%.  The new numbers are off by .006%.

This should make the unit tests a bit cleaner, and our tolerances a
bit closer.

7 years agoprotover: reject invalid protocol names
cypherpunks [Sun, 26 Aug 2018 01:20:44 +0000 (01:20 +0000)] 
protover: reject invalid protocol names

The spec only allows the characters [A-Za-z0-9-].

Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f.
Fixes #27316; bugfix on 0.2.9.4-alpha.

7 years agorust/protover: validate unknown protocol names use only allowed characters
cypherpunks [Thu, 13 Sep 2018 16:33:58 +0000 (16:33 +0000)] 
rust/protover: validate unknown protocol names use only allowed characters

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Thu, 13 Sep 2018 15:46:04 +0000 (11:46 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Thu, 13 Sep 2018 15:46:04 +0000 (11:46 -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 [Thu, 13 Sep 2018 15:46:04 +0000 (11:46 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'bug27658_029' into maint-0.2.9
Nick Mathewson [Thu, 13 Sep 2018 15:45:58 +0000 (11:45 -0400)] 
Merge branch 'bug27658_029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 12 Sep 2018 21:24:41 +0000 (17:24 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agofixup! changes file
cypherpunks [Wed, 12 Sep 2018 14:22:31 +0000 (14:22 +0000)] 
fixup! changes file

7 years agoCheck waitpid return value and exit status in tinytest.c
Nick Mathewson [Wed, 12 Sep 2018 12:57:18 +0000 (08:57 -0400)] 
Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.

7 years agoMerge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
Nick Mathewson [Wed, 12 Sep 2018 12:17:42 +0000 (08:17 -0400)] 
Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4

7 years agorust/protover: fix check for overlapping ranges
cypherpunks [Wed, 12 Sep 2018 02:14:29 +0000 (02:14 +0000)] 
rust/protover: fix check for overlapping ranges

Closes ticket 27649. Bugfix on e6625113c98c281b0a649598d7daa347c28915e9.

7 years agorust/protover: remove version zero from tests
cypherpunks [Sat, 18 Aug 2018 20:05:19 +0000 (20:05 +0000)] 
rust/protover: remove version zero from tests

This isn't legal according to dir-spec.txt.

We can write separate tests for it if the spec
is changed to make it legal.

7 years agotest/protover: remove version zero from tests
cypherpunks [Sat, 18 Aug 2018 16:54:09 +0000 (16:54 +0000)] 
test/protover: remove version zero from tests

This isn't legal according to dir-spec.txt.

We can write separate tests for it if the spec
is changed to make it legal.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 11 Sep 2018 19:53:06 +0000 (15:53 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoBug 25505: Check circuitmux queues before padding.
Mike Perry [Tue, 13 Mar 2018 13:50:35 +0000 (13:50 +0000)] 
Bug 25505: Check circuitmux queues before padding.

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 11 Sep 2018 17:09:21 +0000 (13:09 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 11 Sep 2018 17:09:21 +0000 (13:09 -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 [Tue, 11 Sep 2018 17:09:21 +0000 (13:09 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
Nick Mathewson [Tue, 11 Sep 2018 17:09:18 +0000 (13:09 -0400)] 
Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4

7 years agoMerge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
Nick Mathewson [Tue, 11 Sep 2018 17:09:09 +0000 (13:09 -0400)] 
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
Nick Mathewson [Tue, 11 Sep 2018 17:09:04 +0000 (13:09 -0400)] 
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
Nick Mathewson [Tue, 11 Sep 2018 17:08:57 +0000 (13:08 -0400)] 
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Tue, 11 Sep 2018 16:04:56 +0000 (12:04 -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 [Tue, 11 Sep 2018 16:04:56 +0000 (12:04 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 11 Sep 2018 16:04:55 +0000 (12:04 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoUpdate geoip and geoip6 to the September 6 2018 database.
Karsten Loesing [Tue, 11 Sep 2018 07:26:59 +0000 (09:26 +0200)] 
Update geoip and geoip6 to the September 6 2018 database.

7 years agoBump to 0.3.4.8-dev
Nick Mathewson [Mon, 10 Sep 2018 13:42:40 +0000 (09:42 -0400)] 
Bump to 0.3.4.8-dev

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Mon, 10 Sep 2018 13:42:22 +0000 (09:42 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump.

7 years agoBump to 0.3.3.10-dev.
Nick Mathewson [Mon, 10 Sep 2018 13:42:12 +0000 (09:42 -0400)] 
Bump to 0.3.3.10-dev.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 10 Sep 2018 13:41:55 +0000 (09:41 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid version bump.

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Mon, 10 Sep 2018 13:41:39 +0000 (09:41 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid version bump.

7 years agoBump to 0.3.2.12-dev
Nick Mathewson [Mon, 10 Sep 2018 13:41:34 +0000 (09:41 -0400)] 
Bump to 0.3.2.12-dev

7 years agoBump to 0.2.9.17-dev
Nick Mathewson [Mon, 10 Sep 2018 13:41:22 +0000 (09:41 -0400)] 
Bump to 0.2.9.17-dev

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 7 Sep 2018 19:12:27 +0000 (15:12 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid bump.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 19:12:09 +0000 (15:12 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid bump

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 19:11:49 +0000 (15:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid bump

7 years agoBump to 0.3.3.10
Nick Mathewson [Fri, 7 Sep 2018 19:11:18 +0000 (15:11 -0400)] 
Bump to 0.3.3.10

7 years agoBump to 0.3.2.12
Nick Mathewson [Fri, 7 Sep 2018 19:11:07 +0000 (15:11 -0400)] 
Bump to 0.3.2.12

7 years agoBump to 0.2.9.17
Nick Mathewson [Fri, 7 Sep 2018 19:10:49 +0000 (15:10 -0400)] 
Bump to 0.2.9.17

7 years agoBump to 0.3.4.8
Nick Mathewson [Fri, 7 Sep 2018 13:49:29 +0000 (09:49 -0400)] 
Bump to 0.3.4.8

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -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 [Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 13:15:52 +0000 (09:15 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'ticket27344_029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 13:15:15 +0000 (09:15 -0400)] 
Merge branch 'ticket27344_029' into maint-0.2.9

7 years agoTell openssl to build its TLS contexts with security level 1
Nick Mathewson [Fri, 7 Sep 2018 12:57:14 +0000 (08:57 -0400)] 
Tell openssl to build its TLS contexts with security level 1

Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.

7 years agoMerge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
Nick Mathewson [Fri, 7 Sep 2018 12:48:19 +0000 (08:48 -0400)] 
Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:46:41 +0000 (08:46 -0400)] 
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 12:46:35 +0000 (08:46 -0400)] 
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:44:40 +0000 (08:44 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3