]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 8 Sep 2017 12:24:47 +0000 (08:24 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug22644_029' into maint-0.2.9
Nick Mathewson [Fri, 8 Sep 2017 12:24:36 +0000 (08:24 -0400)] 
Merge branch 'bug22644_029' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 7 Sep 2017 19:18:01 +0000 (15:18 -0400)] 
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, 7 Sep 2017 19:18:00 +0000 (15:18 -0400)] 
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, 7 Sep 2017 19:18:00 +0000 (15:18 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoUpdate geoip and geoip6 to the September 6 2017 database.
Karsten Loesing [Thu, 7 Sep 2017 19:06:16 +0000 (21:06 +0200)] 
Update geoip and geoip6 to the September 6 2017 database.

8 years agoFix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
Nick Mathewson [Thu, 7 Sep 2017 13:20:00 +0000 (09:20 -0400)] 
Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands

Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha
respectively.

8 years agoMerge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
Nick Mathewson [Thu, 3 Aug 2017 13:12:23 +0000 (09:12 -0400)] 
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 3 Aug 2017 12:44:31 +0000 (08:44 -0400)] 
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, 3 Aug 2017 12:44:31 +0000 (08:44 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 3 Aug 2017 12:44:31 +0000 (08:44 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoUpdate geoip and geoip6 to the August 3 2017 database.
Karsten Loesing [Thu, 3 Aug 2017 08:00:54 +0000 (10:00 +0200)] 
Update geoip and geoip6 to the August 3 2017 database.

8 years agoversion bump to 0.3.0.10-dev
Nick Mathewson [Wed, 2 Aug 2017 16:28:34 +0000 (12:28 -0400)] 
version bump to 0.3.0.10-dev

8 years agoBump to 0.3.0.10
Nick Mathewson [Tue, 1 Aug 2017 18:38:49 +0000 (14:38 -0400)] 
Bump to 0.3.0.10

8 years agohs: Cleanup logging statement in hs_intropoint.c
David Goulet [Tue, 1 Aug 2017 18:15:47 +0000 (14:15 -0400)] 
hs: Cleanup logging statement in hs_intropoint.c

One log statement was a warning and has been forgotten. It is triggered for a
successful attempt at introducting from a client.

It has been reported here:
https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html

Three other log_warn() statement changed to protocol warning because they are
errors that basically can come from the network and thus triggered by anyone.

Fixes #23078.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:30:33 +0000 (11:30 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:30:29 +0000 (11:30 -0400)] 
Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:28:39 +0000 (11:28 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:28:36 +0000 (11:28 -0400)] 
Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9

8 years agoMerge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:24:02 +0000 (11:24 -0400)] 
Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:23:00 +0000 (11:23 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:22:42 +0000 (11:22 -0400)] 
Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:21:19 +0000 (11:21 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug18100_029' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:21:14 +0000 (11:21 -0400)] 
Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:19:30 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux maint-0.2.7-redux
Nick Mathewson [Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6 maint-0.2.6
Nick Mathewson [Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 1 Aug 2017 15:19:28 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4 maint-0.2.4
Nick Mathewson [Tue, 1 Aug 2017 15:19:24 +0000 (11:19 -0400)] 
Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 27 Jul 2017 12:23:36 +0000 (08:23 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
Nick Mathewson [Thu, 27 Jul 2017 12:23:34 +0000 (08:23 -0400)] 
Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 19:39:56 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoPoint travis to #tor-ci, not #tor-bots
Nick Mathewson [Wed, 26 Jul 2017 19:39:50 +0000 (15:39 -0400)] 
Point travis to #tor-ci, not #tor-bots

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 19:37:06 +0000 (15:37 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoTravis update: "gcc-warnings" became "fatal-warnings" in 0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:37:00 +0000 (15:37 -0400)] 
Travis update: "gcc-warnings" became "fatal-warnings" in 0.2.9

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:35:17 +0000 (15:35 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Wed, 26 Jul 2017 19:35:07 +0000 (15:35 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Wed, 26 Jul 2017 19:35:01 +0000 (15:35 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 26 Jul 2017 19:34:56 +0000 (15:34 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 19:34:40 +0000 (15:34 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 16:58:22 +0000 (12:58 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug23030_029_v2' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 16:58:17 +0000 (12:58 -0400)] 
Merge branch 'bug23030_029_v2' into maint-0.2.9

8 years agoFix build warnings from Coverity related to our BUG macro
Nick Mathewson [Tue, 25 Jul 2017 14:14:24 +0000 (10:14 -0400)] 
Fix build warnings from Coverity related to our BUG macro

In the Linux kernel, the BUG() macro causes an instant panic.  Our
BUG() macro is different, however: it generates a nonfatal assertion
failure, and is usable as an expression.

Additionally, this patch tells util_bug.h to make all assertion
failures into fatal conditions when we're building with a static
analysis tool, so that the analysis tool can look for instances
where they're reachable.

Fixes bug 23030.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 16:53:38 +0000 (12:53 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug22915_029_2' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 16:53:13 +0000 (12:53 -0400)] 
Merge branch 'bug22915_029_2' into maint-0.2.9

8 years agoSuppress clang4-specific -Wdouble-promotion warnings
Nick Mathewson [Thu, 13 Jul 2017 21:42:04 +0000 (17:42 -0400)] 
Suppress clang4-specific -Wdouble-promotion warnings

Wow, it sure seems like some compilers can't implement isnan() and
friends in a way that pleases themselves!

Fixes bug 22915. Bug trigged by 0.2.8.1-alpha and later; caused by
clang 4.

8 years agoIn < 0.2.9.x, --enable-fatal-warnings was --enable-gcc-warnings.
Isis Lovecruft [Tue, 25 Jul 2017 01:03:15 +0000 (01:03 +0000)] 
In < 0.2.9.x, --enable-fatal-warnings was --enable-gcc-warnings.

8 years agoBuilds on CI should use --enable-fragile-hardening.
Isis Lovecruft [Mon, 24 Jul 2017 23:07:09 +0000 (23:07 +0000)] 
Builds on CI should use --enable-fragile-hardening.

(cherry picked from commit c91a57ccf90308c6728184b43519f96b61acb95d)

8 years agoInstall optional dependencies during Travis CI builds.
Isis Lovecruft [Mon, 24 Jul 2017 18:53:18 +0000 (18:53 +0000)] 
Install optional dependencies during Travis CI builds.

(cherry picked from commit 1bb00fb812c0df7a574ed62e9f53b0e8192c7d04)

8 years agoFix CI homebrew checks for outdated packages.
Isis Lovecruft [Mon, 24 Jul 2017 18:26:36 +0000 (18:26 +0000)] 
Fix CI homebrew checks for outdated packages.

(cherry picked from commit 8f8689f70235dc19cbc5092ea148af5772a9cdc3)

8 years agoAdd a changes file for bug22636.
Isis Lovecruft [Wed, 12 Jul 2017 00:32:38 +0000 (00:32 +0000)] 
Add a changes file for bug22636.

8 years agoFix and expand upon our Travis CI configuration.
Isis Lovecruft [Tue, 11 Jul 2017 20:12:15 +0000 (20:12 +0000)] 
Fix and expand upon our Travis CI configuration.

 * CHANGE .travis.yml so that commands for different purposes (e.g. getting
   dependencies, building, testing) are in separate config lines and sections.
 * CHANGE .travis.yml to use their mechanism for installing dependencies via
   apt. [0]  This also allows us to not need sudo (the "sudo: false" line).
 * CHANGE Travis CI tests (the "script:" section) to build and run tests in the
   same manner as Jenkins (i.e. with --enable-fatal-warnings and
   --disable-silent-rules and run `make check`).
 * ADD Travis configuration to do all the target builds with both GCC and clang.
 * ADD make flags to build with both of the cores available.
 * ADD notifications for IRC, and configure email notifications (to the author
   of the commit) only if the branch was previously building successfully and
   the latest commit broke it.
 * ADD the ability to run the Travis build matrix for OSX as well, but leave it
   commented out by default (because it takes roughly ten times longer, due to a
   shortage of OSX build machines).
 * ADD Travis config option to cancel/fail the build early if one target has
   already failed ("fast_finish: true").
 * ADD comments to describe what our Travis config is doing and why it is
   configured that way.

[0]: https://docs.travis-ci.com/user/installing-dependencies/#Installing-Packages-on-Container-Based-Infrastructure)

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 14 Jul 2017 13:11:14 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug22916_027' into maint-0.2.9
Nick Mathewson [Fri, 14 Jul 2017 13:11:08 +0000 (09:11 -0400)] 
Merge branch 'bug22916_027' into maint-0.2.9

8 years agoMerge branch 'bug22803_030' into maint-0.3.0
Nick Mathewson [Fri, 14 Jul 2017 13:06:33 +0000 (09:06 -0400)] 
Merge branch 'bug22803_030' into maint-0.3.0

8 years ago.travis.yml to run test suite
Patrick O'Doherty [Sun, 2 Jul 2017 21:28:52 +0000 (14:28 -0700)] 
.travis.yml to run test suite

Installs dependencies (including rust) and runs the existing test suite.

TODO: Introduce build matrix utilizing the rust toolchain to run test
suites both with and without the rust components.

8 years agoFix compiler warnings with openssl-scrypt/libscrypt test on clang
Nick Mathewson [Thu, 13 Jul 2017 21:49:48 +0000 (17:49 -0400)] 
Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Fri, 7 Jul 2017 14:56:31 +0000 (10:56 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 7 Jul 2017 14:56:31 +0000 (10:56 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug22838_028' into maint-0.2.8
Nick Mathewson [Fri, 7 Jul 2017 14:55:51 +0000 (10:55 -0400)] 
Merge branch 'bug22838_028' into maint-0.2.8

8 years agomingw fix: avoid "unused var" warning.
Nick Mathewson [Thu, 6 Jul 2017 17:12:33 +0000 (13:12 -0400)] 
mingw fix: avoid "unused var" warning.

This is a backport of 19615bce64cd381a925bc3910120ac39ca918e7c to
fix bug 22838.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Fri, 7 Jul 2017 14:51:28 +0000 (10:51 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMention TROVE-2017-007 in changes file for 22789
Nick Mathewson [Fri, 7 Jul 2017 14:51:25 +0000 (10:51 -0400)] 
Mention TROVE-2017-007 in changes file for 22789

8 years agoUpdate geoip and geoip6 to the July 4 2017 database.
Karsten Loesing [Fri, 7 Jul 2017 14:27:54 +0000 (16:27 +0200)] 
Update geoip and geoip6 to the July 4 2017 database.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 5 Jul 2017 20:11:48 +0000 (16:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoOnly disable -Wfloat-conversion on mingw when it exists.
Nick Mathewson [Wed, 5 Jul 2017 20:10:45 +0000 (16:10 -0400)] 
Only disable -Wfloat-conversion on mingw when it exists.

The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion
didn't exist in every relevant mingw; it was added in GCC 4.9.x some
time, if the documentation can be trusted.

Bug not in any released version of tor.

8 years agoFix unit test memory leak in certs_ok_ed25519.
Nick Mathewson [Wed, 5 Jul 2017 19:42:25 +0000 (15:42 -0400)] 
Fix unit test memory leak in certs_ok_ed25519.

Fixes bug 22803; bugfix on 0.3.0.1-alpha.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 5 Jul 2017 17:43:31 +0000 (13:43 -0400)] 
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 [Wed, 5 Jul 2017 17:43:21 +0000 (13:43 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Wed, 5 Jul 2017 17:42:47 +0000 (13:42 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Wed, 5 Jul 2017 17:42:37 +0000 (13:42 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 5 Jul 2017 17:42:32 +0000 (13:42 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 5 Jul 2017 17:42:26 +0000 (13:42 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'bug22789_024' into maint-0.2.4
Nick Mathewson [Wed, 5 Jul 2017 17:41:27 +0000 (13:41 -0400)] 
Merge branch 'bug22789_024' into maint-0.2.4

8 years agoAllow setsockopt(IPV6_V6ONLY) in sandbox.
Nick Mathewson [Wed, 5 Jul 2017 17:09:21 +0000 (13:09 -0400)] 
Allow setsockopt(IPV6_V6ONLY) in sandbox.

Fixes bug 20247.  We started setting V6ONLY in 0.2.3.13-alpha and
added the sandbox on 0.2.5.1-alpha.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 5 Jul 2017 15:19:03 +0000 (11:19 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug22801_028' into maint-0.2.9
Nick Mathewson [Wed, 5 Jul 2017 15:18:59 +0000 (11:18 -0400)] 
Merge branch 'bug22801_028' into maint-0.2.9

8 years agoFix assertion failure related to openbsd strtol().
Nick Mathewson [Mon, 3 Jul 2017 15:20:09 +0000 (11:20 -0400)] 
Fix assertion failure related to openbsd strtol().

Fixes bug 22789; bugfix on 0.2.3.8-alpha.

8 years agoFix -Wfloat-conversion C warnings on mingw in clamp_double_to_int64.
Nick Mathewson [Mon, 3 Jul 2017 14:59:31 +0000 (10:59 -0400)] 
Fix -Wfloat-conversion C warnings on mingw in clamp_double_to_int64.

We just have to suppress these warnings: Mingw's math.h uses gcc's
__builtin_choose_expr() facility to declare isnan, isfinite, and
signbit.  But as implemented in at least some versions of gcc,
__builtin_choose_expr() can generate type warnings even from
branches that are not taken.

Fixes bug 22801; bugfix on 0.2.8.1-alpha.

8 years agobump to 0.3.0.9-dev
Nick Mathewson [Thu, 29 Jun 2017 22:44:43 +0000 (18:44 -0400)] 
bump to 0.3.0.9-dev

8 years agoUpdate maint-0.3.0 to 0.3.0.9
Nick Mathewson [Thu, 29 Jun 2017 20:35:40 +0000 (16:35 -0400)] 
Update maint-0.3.0 to 0.3.0.9

8 years agoMerge branch 'trove-2017-006' into maint-0.3.0
Nick Mathewson [Thu, 29 Jun 2017 19:57:42 +0000 (15:57 -0400)] 
Merge branch 'trove-2017-006' into maint-0.3.0

8 years agoAdjust unit tests to account for fix to bug 22753.
Nick Mathewson [Thu, 29 Jun 2017 14:09:06 +0000 (10:09 -0400)] 
Adjust unit tests to account for fix to bug 22753.

Our mock network put all the guards on the same IPv4 address, which
doesn't fly when we start applying EnforceDistinctSubnets.  So in
this commit, I disable EnforceDistinctSubnets when running the old
guard_restriction_t test.

This commit also adds a regression test for #22753.

8 years agoConsider the exit family when applying guard restrictions.
Nick Mathewson [Wed, 28 Jun 2017 15:41:50 +0000 (11:41 -0400)] 
Consider the exit family when applying guard restrictions.

When the new path selection logic went into place, I accidentally
dropped the code that considered the _family_ of the exit node when
deciding if the guard was usable, and we didn't catch that during
code review.

This patch makes the guard_restriction_t code consider the exit
family as well, and adds some (hopefully redundant) checks for the
case where we lack a node_t for a guard but we have a bridge_info_t
for it.

Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016-006
and CVE-2017-0377.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 28 Jun 2017 18:03:23 +0000 (14:03 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
Nick Mathewson [Wed, 28 Jun 2017 18:03:20 +0000 (14:03 -0400)] 
Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 28 Jun 2017 17:58:37 +0000 (13:58 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9
Nick Mathewson [Wed, 28 Jun 2017 17:57:54 +0000 (13:57 -0400)] 
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9