]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoMake sure we always wind up checking i2d_*'s output.
Nick Mathewson [Wed, 9 Aug 2017 13:24:16 +0000 (09:24 -0400)] 
Make sure we always wind up checking i2d_*'s output.

The biggest offender here was sometimes not checking the output of
crypto_pk_get_digest.

Fixes bug 19418.  Reported by Guido Vranken.

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 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 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 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/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 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.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 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.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 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 '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 '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 '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 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 '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.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 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 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 '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 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 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

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -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 [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -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 [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -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, 27 Jun 2017 15:04:44 +0000 (11:04 -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 [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'bug22737_024' into maint-0.2.4
Nick Mathewson [Tue, 27 Jun 2017 15:04:41 +0000 (11:04 -0400)] 
Merge branch 'bug22737_024' into maint-0.2.4

8 years agoFix an errant memset() into the middle of a struct in cell_pack().
Nick Mathewson [Tue, 27 Jun 2017 14:45:29 +0000 (10:45 -0400)] 
Fix an errant memset() into the middle of a struct in cell_pack().

This mistake causes two possible bugs. I believe they are both
harmless IRL.

BUG 1: memory stomping

When we call the memset, we are overwriting two 0 bytes past the end
of packed_cell_t.body. But I think that's harmless in practice,
because the definition of packed_cell_t is:

// ...
typedef struct packed_cell_t {
  TOR_SIMPLEQ_ENTRY(packed_cell_t) next;
  char body[CELL_MAX_NETWORK_SIZE];
  uint32_t inserted_time;
} packed_cell_t;

So we will overwrite either two bytes of inserted_time, or two bytes
of padding, depending on how the platform handles alignment.

If we're overwriting padding, that's safe.

If we are overwriting the inserted_time field, that's also safe: In
every case where we call cell_pack() from connection_or.c, we ignore
the inserted_time field. When we call cell_pack() from relay.c, we
don't set or use inserted_time until right after we have called
cell_pack(). SO I believe we're safe in that case too.

BUG 2: memory exposure

The original reason for this memset was to avoid the possibility of
accidentally leaking uninitialized ram to the network. Now
remember, if wide_circ_ids is false on a connection, we shouldn't
actually be sending more than 512 bytes of packed_cell_t.body, so
these two bytes can only leak to the network if there is another bug
somewhere else in the code that sends more data than is correct.

Fortunately, in relay.c, where we allocate packed_cell_t in
packed_cell_new() , we allocate it with tor_malloc_zero(), which
clears the RAM, right before we call cell_pack. So those
packed_cell_t.body bytes can't leak any information.

That leaves the two calls to cell_pack() in connection_or.c, which
use stack-alocated packed_cell_t instances.

In or_handshake_state_record_cell(), we pass the cell's contents to
crypto_digest_add_bytes(). When we do so, we get the number of
bytes to pass using the same setting of wide_circ_ids as we passed
to cell_pack(). So I believe that's safe.

In connection_or_write_cell_to_buf(), we also use the same setting
of wide_circ_ids in both calls. So I believe that's safe too.

I introduced this bug with 1c0e87f6d8c7a0abdadf1b5cd9082c10abc7f4e2
back in 0.2.4.11-alpha; it is bug 22737 and CID 1401591

8 years agoMerge remote-tracking branch 'public/bug22516_029' into maint-0.2.9
Nick Mathewson [Mon, 19 Jun 2017 17:50:49 +0000 (13:50 -0400)] 
Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9

8 years agoPermit the fchmod system call.
Nick Mathewson [Fri, 16 Jun 2017 18:03:02 +0000 (14:03 -0400)] 
Permit the fchmod system call.

Fixes bug 22516; bugfix on 0.2.5.4-alpha.

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Fri, 9 Jun 2017 13:58:46 +0000 (09:58 -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 [Fri, 9 Jun 2017 13:58:45 +0000 (09:58 -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 [Fri, 9 Jun 2017 13:58:45 +0000 (09:58 -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, 9 Jun 2017 13:58:45 +0000 (09:58 -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, 9 Jun 2017 13:58:45 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the June 8 2017 database.
Karsten Loesing [Fri, 9 Jun 2017 13:47:49 +0000 (15:47 +0200)] 
Update geoip and geoip6 to the June 8 2017 database.

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 8 Jun 2017 18:06:28 +0000 (14:06 -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 [Thu, 8 Jun 2017 18:06:16 +0000 (14:06 -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 [Thu, 8 Jun 2017 18:06:06 +0000 (14:06 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Thu, 8 Jun 2017 18:05:59 +0000 (14:05 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 8 Jun 2017 18:05:37 +0000 (14:05 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

"ours" merge to avoid version bump.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:27 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:22 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:18 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:16 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:13 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:08 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 8 Jun 2017 13:29:12 +0000 (09:29 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Thu, 8 Jun 2017 13:29:05 +0000 (09:29 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Thu, 8 Jun 2017 13:28:54 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Thu, 8 Jun 2017 13:28:29 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 8 Jun 2017 13:28:11 +0000 (09:28 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

"ours" merge to avoid version bump.

8 years agoBump to 0.2.8.14
Nick Mathewson [Thu, 8 Jun 2017 13:27:54 +0000 (09:27 -0400)] 
Bump to 0.2.8.14

8 years agoBump to 0.2.7.8
Nick Mathewson [Thu, 8 Jun 2017 13:27:34 +0000 (09:27 -0400)] 
Bump to 0.2.7.8

8 years agoBump to 0.2.6.12
Nick Mathewson [Thu, 8 Jun 2017 13:26:20 +0000 (09:26 -0400)] 
Bump to 0.2.6.12

8 years agobump to 0.2.5.14
Nick Mathewson [Thu, 8 Jun 2017 13:26:00 +0000 (09:26 -0400)] 
bump to 0.2.5.14

8 years agoBump to 0.2.4.29
Nick Mathewson [Thu, 8 Jun 2017 13:25:31 +0000 (09:25 -0400)] 
Bump to 0.2.4.29

8 years agobump to 0.2.9.11
Nick Mathewson [Thu, 8 Jun 2017 13:24:38 +0000 (09:24 -0400)] 
bump to 0.2.9.11