[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 279fa65d34bbb41d1428eb62f6172b218598644e
Merge: 1d281eb93 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 1d281eb933d6cf51d8a488bface6bf3f0a963f4f
Merge: 0d63a6064 0eb2cdf99
Author: Nick Mathewson 
Date:   Mon Mar 19 05:42:43 2018 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 .travis.yml | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 0d63a60643f16974e857a16e5f6e36663d3caca3
Merge: b2c220a62 3418a3a7f
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-03-08 | 4 +
 src/config/geoip | 36382 -
 src/config/geoip6|   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit b2c220a623408839b0d918f343a08e92367b45d5
Merge: 7d1d868ea f1278b7e5
Author: Nick Mathewson 
Date:   Thu Feb 8 10:29:05 2018 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-02-07 | 4 +
 src/config/geoip | 34364 -
 src/config/geoip6|   841 +-
 3 files changed, 28369 insertions(+), 6840 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 7d1d868ea0ed2cacd845677a86b4ddb813962ee1
Merge: e212c752f 49de586ad
Author: Nick Mathewson 
Date:   Fri Jan 19 10:18:59 2018 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 .travis.yml | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit e212c752f26a3c387ccda6beb2cb6c264a0ba98d
Merge: eb0c7ab43 8efbeb098
Author: Nick Mathewson 
Date:   Mon Jan 8 09:34:56 2018 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-01-05 | 4 +
 src/config/geoip | 31441 ++---
 src/config/geoip6|   753 +-
 3 files changed, 7587 insertions(+), 24611 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit eb0c7ab43391673945e11a92c7f186620aa3a8fa
Merge: ba0c0ef77 920208776
Author: Nick Mathewson 
Date:   Thu Dec 21 10:58:20 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug24666   |  7 
 src/or/circuitmux.c| 34 +--
 src/or/circuitmux.h|  2 +-
 src/or/or.h| 15 +
 src/or/relay.c | 82 --
 src/or/relay.h |  8 +
 src/test/test_circuitmux.c | 12 +++
 7 files changed, 126 insertions(+), 34 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit ba0c0ef771b3de5bc69bddfda0383734c69def87
Merge: bb0af 428f8a375
Author: Nick Mathewson 
Date:   Wed Dec 20 12:15:23 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2017-12-06 | 4 +
 src/config/geoip | 12380 +++--
 src/config/geoip6|  3373 +---
 3 files changed, 10033 insertions(+), 5724 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit bb0afa7ba6f1af0e64afbed13376855ea88d
Merge: ca19b2115 1deda2106
Author: Nick Mathewson 
Date:   Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug24167| 7 +++
 src/or/connection.c | 4 
 2 files changed, 11 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit ca19b2115a761ec37a6af56f6672cc0e16658929
Merge: 20ca62ffb f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:53:07 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 20ca62ffb5dd3640c7d3054612c158c08d8ee677
Merge: 9cb1c2b4a 461e34bb3
Author: Nick Mathewson 
Date:   Fri Dec 1 12:13:39 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug24480 | 3 +++
 src/or/rendservice.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 9cb1c2b4ad37f7af1c0d58858f0e5fbe04f33730
Merge: 7d83cfb3a 162a087e5
Author: Nick Mathewson 
Date:   Fri Dec 1 09:35:43 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 4902cfcf19a8c529bc43f9bb4c170ed3b9680bf6
Merge: 6d0f332a2 6bda6777c
Author: Nick Mathewson 
Date:   Thu Nov 30 12:28:39 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 6d0f332a2efe9d9493627081e02a1983d32c15a0
Merge: 6177674a5 f49876d66
Author: Nick Mathewson 
Date:   Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/trove-2017-009   | 10 ++
 changes/trove-2017-011   |  8 
 changes/trove-2017-012-part1 |  6 ++
 src/common/crypto.c  | 16 +---
 src/or/rendservice.c |  4 +++-
 src/or/routerlist.c  |  5 -
 6 files changed, 44 insertions(+), 5 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 6177674a5b0bba4deea3842195654c59def08f73
Merge: e26f38702 831d3b794
Author: Nick Mathewson 
Date:   Sat Nov 18 11:03:16 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug18329-minimal | 6 ++
 src/or/router.c  | 9 +
 2 files changed, 15 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit e26f387026134b45ca4f031010abed949c600807
Merge: 765fd0845 6f8c32b7d
Author: Nick Mathewson 
Date:   Sat Nov 11 12:23:33 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2017-11-06 |4 +
 src/config/geoip | 9406 --
 src/config/geoip6|  848 -
 3 files changed, 6426 insertions(+), 3832 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 765fd0845f58dee27e48a1a786e9dacb00663616
Merge: 5a0e73c75 82f8b27ff
Author: Nick Mathewson 
Date:   Wed Oct 25 09:29:00 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 078604630dad7edc57cc9378102de65f06586efd
Merge: 8669a1ea5 743eee493
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:42 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 5e1bad325965c4f91433dfbe46f4d3c268327d4e
Merge: 533ae56fc 15a699462
Author: Nick Mathewson 
Date:   Mon Oct 23 09:03:58 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/ticket23910 | 3 +++
 src/or/config.c | 3 +++
 2 files changed, 6 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 533ae56fcf57e8120549f6026677923fc66e9e26
Merge: 558eafe56 5d219ecf9
Author: Nick Mathewson 
Date:   Mon Oct 23 08:57:22 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/longclaw_23592 | 3 +++
 src/or/config.c| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 558eafe56e0d3fd0d769a330cecc9f02f85aa8a6
Merge: e2979ebe2 2e21493a8
Author: Nick Mathewson 
Date:   Thu Oct 5 11:04:59 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-october2017 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit e2979ebe252cb1a361b4c4aea1cbfce74697ec39
Merge: e17659b70 b9d9b16b7
Author: Nick Mathewson 
Date:   Thu Oct 5 11:03:35 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-october2017 |4 +
 src/config/geoip  | 8683 +++--
 src/config/geoip6 |  653 ++--
 3 files changed, 5654 insertions(+), 3686 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit e17659b7011fa63b398b244f2cef225636ea08d5
Merge: 4e10ada1e 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 4e10ada1e8262a3d8038f09eca1b92570a12c59d
Merge: 2e2ec4cb5 1280de42a
Author: Nick Mathewson 
Date:   Thu Aug 3 08:44:31 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-august2017 | 4 +
 src/config/geoip | 10796 -
 src/config/geoip6|   607 ++-
 3 files changed, 7161 insertions(+), 4246 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 2e2ec4cb5ee71650aa014d5d523b41abe12379f3
Merge: 0c6c4 0bfd1c318
Author: Nick Mathewson 
Date:   Tue Aug 1 11:19:28 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-july2017 | 4 +
 src/config/geoip   | 10075 ---
 src/config/geoip6  |   694 +++-
 3 files changed, 7530 insertions(+), 3243 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 0c6c4023141ab516d81fc244520bf8ee20fc
Merge: d1340423f af39c13a0
Author: Nick Mathewson 
Date:   Wed Jul 26 15:39:55 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit d1340423faacb43884fc42d75e8ed8477fe5c7e1
Merge: e4d7f97c4 09618bc48
Author: Nick Mathewson 
Date:   Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 .travis.yml  | 88 
 changes/bug22636 |  8 ++
 2 files changed, 96 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit e4d7f97c401c79218d2ef88ba9db117d677bcc8f
Merge: 9c96dbe 78dfa76
Author: Nick Mathewson 
Date:   Fri Jul 7 10:51:28 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug22789 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 9c96dbe7b01a5415fd070f4901f4125b20c29dfc
Merge: e6d7752 ff8c230
Author: Nick Mathewson 
Date:   Wed Jul 5 13:43:31 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug22789 | 6 ++
 src/common/compat.c  | 8 ++--
 src/test/test_addr.c | 9 +
 3 files changed, 21 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit e6d77520ef99c2f0d576f0314d3f86322e16b3af
Merge: c1195d4 ccae991
Author: Nick Mathewson 
Date:   Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug22737   | 12 
 src/or/connection_or.c |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit c1195d42bcc93579fd2f460b316bac85928d1442
Merge: 24bc8ca 325c507
Author: Nick Mathewson 
Date:   Fri Jun 9 09:58:45 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-june2017 |4 +
 src/config/geoip   | 5079 +---
 src/config/geoip6  | 1952 +--
 3 files changed, 4449 insertions(+), 2586 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 24bc8caf35818bda598f53a3a294b0920d3d3bf6
Merge: e14006a 1a7af74
Author: Nick Mathewson 
Date:   Thu Jun 8 14:06:56 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit d9dd67e2169c70e32e833d1e4d93bf83d363def7
Merge: 0a78d29 77c5d8c
Author: Nick Mathewson 
Date:   Thu Jun 8 09:29:49 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 0a78d2947cc1f7a0aa2ede2c37baec3e4c23a424
Merge: 020c003 dec7998
Author: Nick Mathewson 
Date:   Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/trove-2017-005 | 7 +++
 src/or/relay.c | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 020c003a636a876a1b86295592e8782ab93df5a3
Merge: b104ea7 2e5220c
Author: Nick Mathewson 
Date:   Mon Jun 5 14:39:00 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 src/or/geoip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit b104ea724dedebe49db299474abfd950ca0da0cb
Merge: 33b69e6 1a540b5
Author: Nick Mathewson 
Date:   Mon Jun 5 12:00:14 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug22490 | 3 +++
 src/or/geoip.c   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 33b69e68847fd3cb7fd3a300633e5c4966afda6b
Merge: 148d76c 68d6720
Author: Nick Mathewson 
Date:   Mon May 8 08:08:01 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-may2017 |4 +
 src/config/geoip  | 5862 +++--
 src/config/geoip6 |  689 +-
 3 files changed, 4358 insertions(+), 2197 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 148d76c0928c224c500c9a3d1963cff9f2201631
Merge: 51ca3dc a8a860e
Author: Nick Mathewson 
Date:   Thu Apr 6 08:32:36 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-april2017 | 4 +
 src/config/geoip| 14366 +-
 src/config/geoip6   |   677 ++-
 3 files changed, 9792 insertions(+), 5255 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 51ca3dc8116320b57cec619bca61a372a05f01ce
Merge: 45245fe 933a1e7
Author: Nick Mathewson 
Date:   Wed Mar 8 10:10:36 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-march2017 | 4 +
 src/config/geoip| 13115 +++---
 src/config/geoip6   |   754 ++-
 3 files changed, 5884 insertions(+), 7989 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 5c5298e4ff1a3fdeb7e19094bf150828d8eb96e7
Merge: 30844dd 884b371
Author: Nick Mathewson 
Date:   Tue Feb 28 10:25:01 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit a8a1e7e8da0903460a170c65f2709932cc3d98f7
Merge: c0ff59f aeb299b
Author: Nick Mathewson <ni...@torproject.org>
Date:   Wed Feb 15 07:53:05 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

_______
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit c0ff59f870a9a831b927f853e3e5e7066a727b05
Merge: c0257f1 a452b71
Author: Nick Mathewson 
Date:   Wed Feb 15 07:50:48 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug20384 | 10 ++
 changes/trove-2017-001.2 |  8 
 src/or/routerparse.c | 49 +---
 3 files changed, 48 insertions(+), 19 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit c0257f14cdf43e2b13d103fdbebf917383fbded6
Merge: 2f6a66a 124062e
Author: Nick Mathewson 
Date:   Mon Feb 13 14:39:13 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-february2017 | 4 +
 src/config/geoip   | 10832 ---
 src/config/geoip6  |  1651 ++-
 3 files changed, 7351 insertions(+), 5136 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 2f6a66a17402029b58f7a29af7c0eae56f5ea390
Merge: 72d9e05 2ce4330
Author: Nick Mathewson 
Date:   Tue Feb 7 10:39:50 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug16248 |  8 
 changes/bug18710 |  6 ++
 src/or/dnsserv.c |  4 +---
 src/or/main.c| 55 +++
 4 files changed, 66 insertions(+), 7 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 72d9e057c37bde3f735961b62ed7dc42adcb48ba
Merge: 9203b3e b9ef21c
Author: Nick Mathewson 
Date:   Tue Feb 7 09:21:13 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bifroest | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 9203b3e4ed21cb6980c1e8051fbd43f1bfc81fe1
Merge: 2393e67 6b37512
Author: Nick Mathewson 
Date:   Tue Feb 7 08:56:39 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/rsa_init_bug | 7 +++
 src/common/crypto.c  | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 2393e67b2e5e474b3fd2a161fddb01e246991881
Merge: e891638 05ec055
Author: Nick Mathewson 
Date:   Tue Feb 7 08:41:33 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug17404|  6 ++
 changes/bug18089|  6 ++
 src/common/crypto.c | 10 ++
 src/common/tortls.c |  4 
 4 files changed, 26 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit e89163845a189c31f05462b1d47d607a29939836
Merge: 2e02b59 34fdd51
Author: Nick Mathewson 
Date:   Wed Jan 11 09:12:06 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-january2017 |4 +
 src/config/geoip  | 3160 +
 src/config/geoip6 |  561 +++-
 3 files changed, 2552 insertions(+), 1173 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 2e02b597721ba640bbbf3082df99b6b7c60660c1
Merge: 056978c 39ef343
Author: Nick Mathewson 
Date:   Tue Dec 20 18:21:40 2016 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 src/or/buffers.c | 41 +
 1 file changed, 33 insertions(+), 8 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 056978c31c8b2c42e2a7352cbf4b9da31185ca65
Merge: 5322713 db58d4d
Author: Nick Mathewson 
Date:   Tue Dec 20 18:11:16 2016 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug21018 | 11 +++
 src/or/rendcommon.c  |  6 --
 src/or/routerparse.c |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 5322713b481411c85a1561af40121bc034b6eda8
Merge: 1ffe29f 3d2d3f2
Author: Nick Mathewson 
Date:   Fri Dec 9 08:34:45 2016 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-december2016 |4 +
 src/config/geoip   | 6259 ++--
 src/config/geoip6  | 1193 -
 3 files changed, 4705 insertions(+), 2751 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 1ffe29ff8d128976790df89a5f7a9c1db14a40d3
Merge: d27160b db2571b
Author: Nick Mathewson 
Date:   Mon Nov 7 09:30:05 2016 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-november2016 |4 +
 src/config/geoip   | 4025 
 src/config/geoip6  | 2490 ++-
 3 files changed, 3407 insertions(+), 3112 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit d27160b407c9b524d232aeb16c610fe6622281dd
Merge: 5394738 304d8f3
Author: Nick Mathewson 
Date:   Thu Oct 6 10:00:18 2016 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-august2016| 4 +
 changes/geoip-july2016  | 4 +
 changes/geoip-october2016   | 4 +
 changes/geoip-september2016 | 4 +
 src/config/geoip| 50585 ++
 src/config/geoip6   |  4439 +++-
 6 files changed, 39529 insertions(+), 15511 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 53947389a77d6d7a01a7c79624390b9bd6c42d6b
Merge: 8c2cad5 19078b1
Author: Nick Mathewson 
Date:   Tue Jul 5 13:51:40 2016 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/19271 | 2 ++
 1 file changed, 2 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 8c2cad52c45a036c6a73da3fd208f5b7bdf649fa
Merge: 77abd68 9d3de77
Author: Nick Mathewson 
Date:   Tue Jul 5 12:25:11 2016 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-jun2016 |4 +
 src/config/geoip  | 3349 +++--
 src/config/geoip6 | 1366 
 src/or/config.c   |2 -
 4 files changed, 3527 insertions(+), 1194 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 77abd688551ac6b71bca5f57009a7d4e92042f25
Merge: c0c92c3 3681463
Author: Nick Mathewson 
Date:   Mon May 9 14:55:31 2016 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-may2016 |4 +
 src/config/geoip  | 6991 -
 src/config/geoip6 |  904 +--
 3 files changed, 4631 insertions(+), 3268 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit c0c92c3e2a7d6ad50a4cf1e93311fa1ea0723d0c
Merge: 01d5921 34a51d1
Author: Nick Mathewson 
Date:   Thu Apr 7 10:46:32 2016 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug18162   | 7 +
 changes/geoip-april2016| 4 +
 changes/geoip-february2016 | 4 +
 changes/geoip-march2016| 4 +
 src/common/container.c |29 +-
 src/config/geoip   | 12867 ++-
 src/config/geoip6  |  2643 +++--
 7 files changed, 11299 insertions(+), 4259 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit c1237ed5161ca6397592ba3da3520bf8af6f23f9
Merge: 5a4caad 3a5d4d6
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Apr 6 09:57:08 2015 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac|2 +-
 contrib/win32build/tor-mingw.nsi.in |2 +-
 src/win32/orconfig.h|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 53a605ee001f54c80352e92e1c714ab9b8a08bab
Merge: cfb61f9 3781955
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Apr 3 09:52:15 2015 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug15515 |4 
 src/or/or.h  |3 +++
 src/or/rendmid.c |   14 ++
 3 files changed, 21 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 6bf06c5656ddd2c3649db790b3bdbb14eb50aaee
Merge: 78d9af3 a00d07a
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Mar 12 10:53:21 2015 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h

 configure.ac|2 +-
 contrib/win32build/tor-mingw.nsi.in |2 +-
 src/win32/orconfig.h|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit e573a519168d3746d429d27702e6e8a46e56411a
Merge: 6bf06c5 9063f29
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Mar 12 12:52:10 2015 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug15205|5 +
 src/common/compat.h |   12 
 2 files changed, 17 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit a286fbd711a6fb197cb95150be57edae3034ca43
Merge: 2f962b9 306f2f0
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Mar 9 16:24:54 2015 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-march2015  |3 +
 changes/geoip6-march2015 |3 +
 src/config/geoip |12695 ++
 src/config/geoip6| 1228 -
 4 files changed, 10398 insertions(+), 3531 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 1d02f64932627bf97f10416c5f36e9745db72e7b
Merge: 42b4260 9e2608b
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Oct 24 09:23:29 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 023ce9e0f8701aa67c7eab29582454ee01b517dc
Merge: 334f4f6 3202ac6
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Oct 20 10:33:18 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h

 configure.ac|2 +-
 contrib/win32build/tor-mingw.nsi.in |2 +-
 src/win32/orconfig.h|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 095080360f1511d35fc62be8bc7c804fbcccbdc3
Merge: 9ffb2d8 fd8f21e
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Oct 19 21:38:17 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug13471 |5 +
 1 file changed, 5 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[arma]

commit 70762a0e9c396bdba01b8cc1cdc6d1c275f9aa1d
Merge: 22a8216 87576e8
Author: Roger Dingledine a...@torproject.org
Date:   Sat Sep 20 16:51:41 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug13100 |3 +++
 src/or/config.c  |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[arma]

commit 0b004ba5c0c00b9d367b5a1e305f9e4e9adc65b6
Merge: 396ac67 be0e262
Author: Roger Dingledine a...@torproject.org
Date:   Fri Sep 19 21:44:23 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bug13151-client |   13 +
 src/or/rendclient.c |2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 396ac67f62de47648193b922122da65a392a1b98
Merge: 40233ca 550c033
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Sep 11 21:44:03 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

This is a theirs merge, to get the version number bumped to
0.2.5.7-rc-dev.

 configure.ac|2 +-
 contrib/win32build/tor-mingw.nsi.in |2 +-
 src/win32/orconfig.h|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[arma]

commit ef89fd142cda9881728410710e5b75c30c1dcbb9
Merge: f8ca81c b159ffb
Author: Roger Dingledine a...@torproject.org
Date:   Thu Aug 21 22:17:23 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 src/or/config.c |2 ++
 1 file changed, 2 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[arma]

commit 0b586b44dd78602a44a1c97df12a67fc9db3b080
Merge: 6c84b12 7760916
Author: Roger Dingledine a...@torproject.org
Date:   Mon Jul 28 04:15:24 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 configure.ac|2 +-
 contrib/win32build/tor-mingw.nsi.in |2 +-
 src/win32/orconfig.h|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[arma]

commit c0411e1c892842f9de1c21ca2a5ede58c7b9649d
Merge: d14fcdc a57c07b
Author: Roger Dingledine a...@torproject.org
Date:   Thu Jul 24 16:31:09 2014 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/bufferevent_compilation |6 +
 changes/bug12602|5 +
 changes/bug8387 |   11 +
 changes/curve25519-donna32-bug  |   12 +
 changes/further-12184-diagnostic|2 +
 changes/geoip-july2014  |3 +
 changes/geoip6-july2014 |2 +
 changes/ticket12688 |6 +
 changes/ticket12690 |9 +
 configure.ac|2 +-
 doc/tor.1.txt   |8 +-
 src/common/tortls.c |2 +
 src/config/geoip| 3600 ++
 src/config/geoip6   | 3674 +++
 src/ext/curve25519_donna/curve25519-donna.c |  292 ++-
 src/or/channel.c|7 +-
 src/or/circuitbuild.c   |2 +
 src/or/circuituse.c |   36 +-
 src/or/circuituse.h |1 +
 src/or/config.c |7 +-
 src/or/connection.c |   60 +-
 src/or/dirserv.c|5 +-
 src/or/entrynodes.c |   20 +-
 src/or/main.c   |5 +-
 src/test/test_oom.c |   13 +-
 25 files changed, 3819 insertions(+), 3971 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits