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

[nickm]

commit 3ae8b32cc97431ff29f1a0dab2b30c7f35038ac9
Merge: c47ab7863 6862eada6
Author: Nick Mathewson 
Date:   Tue Aug 1 11:19:29 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit c47ab7863c6075b079dee3fb72c41d6892835d2c
Merge: 2e9fbab84 f794b40ec
Author: Nick Mathewson 
Date:   Wed Jul 26 15:39:55 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 .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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 2e9fbab843db2f3cdf1dad9207cdff7933d2d07c
Merge: 07d44bea0 0ad5a6b03
Author: Nick Mathewson 
Date:   Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 .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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 07d44bea0b3ea26bd8c0d5bed89a6ba555d5561f
Merge: 332c637 7151854
Author: Nick Mathewson 
Date:   Fri Jul 7 10:51:28 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 332c637f241d5253df34e6fb09f5a5c6bb2574d0
Merge: 1fd9d5e f6420bc
Author: Nick Mathewson 
Date:   Wed Jul 5 13:43:31 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 1fd9d5ef37943a3c4688b113972bb7f6d44dbb7f
Merge: eb4ca1c 3de2761
Author: Nick Mathewson 
Date:   Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit eb4ca1c16eb7983869bac9b4a0276e535d6f7dbe
Merge: 8a556f9 3913f95
Author: Nick Mathewson 
Date:   Fri Jun 9 09:58:45 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 8a556f996c63a6c1cec8f22948e5c84acafb8057
Merge: 21a9e53 eb92d11
Author: Nick Mathewson 
Date:   Thu Jun 8 14:06:56 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

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

diff --cc src/win32/orconfig.h
index 22a9d66,4a9ad29..4a2ae5b
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@@ -232,9 -232,10 +232,9 @@@
  #define USING_TWOS_COMPLEMENT
  
  /* Version number of package */
- #define VERSION "0.2.6.12"
+ #define VERSION "0.2.6.12-dev"
  
  
 -
  #define HAVE_STRUCT_SOCKADDR_IN6
  #define HAVE_STRUCT_IN6_ADDR
  #define RSHIFT_DOES_SIGN_EXTEND

___
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 6937ec7857d6a59045de31eb195325edc4b789ee
Merge: 2b34b23 b796ad0
Author: Nick Mathewson 
Date:   Thu Jun 8 09:29:49 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

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

diff --cc src/win32/orconfig.h
index 396149c,74a27f4..22a9d66
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@@ -232,9 -232,10 +232,9 @@@
  #define USING_TWOS_COMPLEMENT
  
  /* Version number of package */
- #define VERSION "0.2.6.11"
+ #define VERSION "0.2.6.12"
  
  
 -
  #define HAVE_STRUCT_SOCKADDR_IN6
  #define HAVE_STRUCT_IN6_ADDR
  #define RSHIFT_DOES_SIGN_EXTEND



___
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 2b34b2323aa9b7ca30c5f70b39c59145296f9f08
Merge: 48bd659 40bccc2
Author: Nick Mathewson 
Date:   Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 48bd65921466d73ae4178151fe7a671e60c9bfd8
Merge: 0978889 a56cfda
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Jun 5 14:48:30 2017 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

_______
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 0978889563e9986368dfe6d490fd3cf7912414b3
Merge: 183a62d 9ea3d08
Author: Nick Mathewson 
Date:   Mon Jun 5 12:00:34 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 183a62d8cec32ed2569981d8ee5f772a8da35481
Merge: 49670ed 159ddf6
Author: Nick Mathewson 
Date:   Mon May 8 08:08:05 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 49670ed4a0d92c77afbc24e39035c69ef7c50a2e
Merge: 73371db 21d7767
Author: Nick Mathewson 
Date:   Thu Apr 6 08:32:41 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 73371db4b9f82e541150b9f66de45be092fb7a76
Merge: c0c6854 ecc73c3
Author: Nick Mathewson 
Date:   Wed Mar 8 10:10:55 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit d525d7aada590ee8898a6c88bd765cd1bcf06225
Merge: 249126f 57e778f
Author: Nick Mathewson 
Date:   Tue Feb 28 10:26:33 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

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

diff --cc src/win32/orconfig.h
index 0bdaf92,59cd43e..396149c
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@@ -232,9 -232,10 +232,9 @@@
  #define USING_TWOS_COMPLEMENT
  
  /* Version number of package */
- #define VERSION "0.2.6.10-dev"
+ #define VERSION "0.2.6.11"
  
  
 -
  #define HAVE_STRUCT_SOCKADDR_IN6
  #define HAVE_STRUCT_IN6_ADDR
  #define RSHIFT_DOES_SIGN_EXTEND

___
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 48c4bbe9c78ade49a054305498a5e82ea25968bb
Merge: 102b2e7 f7ed4a7
Author: Nick Mathewson <ni...@torproject.org>
Date:   Wed Feb 15 07:53:08 2017 -0500

    Merge branch 'maint-0.2.6' into release-0.2.6

_______
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 102b2e7f8bd203fba84c0ce72a32dc0ed86d2f45
Merge: bf4559c 3781f24
Author: Nick Mathewson 
Date:   Wed Feb 15 07:50:53 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit bf4559c8488d30f53a6b420b8ac61732e7e22c4d
Merge: 0c18b2d 43c18b1
Author: Nick Mathewson 
Date:   Mon Feb 13 14:39:17 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 0c18b2dc769413dd6a2293fd598cd405dc8a6e82
Merge: f9be4b9 f2a3041
Author: Nick Mathewson 
Date:   Tue Feb 7 10:39:52 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit f9be4b96362699a77469cea954270c21c39bc171
Merge: 535e034 5446cb8
Author: Nick Mathewson 
Date:   Tue Feb 7 09:30:31 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug17354 | 4 
 src/or/main.c| 1 -
 2 files changed, 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 535e03400419340c3bed2af5fa810308727293c5
Merge: 56451e8 c6f2ae5
Author: Nick Mathewson 
Date:   Tue Feb 7 09:21:15 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 56451e8b98ac621ae45847762a3d2befe322de44
Merge: db61ae2 e6965f7
Author: Nick Mathewson 
Date:   Tue Feb 7 08:56:42 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit db61ae2c84648db75c949f36d7dc2ee95fe7255b
Merge: 50911dd 8936c50
Author: Nick Mathewson 
Date:   Tue Feb 7 08:41:35 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug17404| 6 ++
 src/common/tortls.c | 4 
 2 files changed, 10 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 50911ddb37de55bfa6ff9a7452b4619f417b060a
Merge: 83b46f1 54771bc
Author: Nick Mathewson 
Date:   Wed Jan 11 09:12:36 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 83b46f11ac321725de5e12357c79bc26f9c44f08
Merge: 4dc5475 b6227ed
Author: Nick Mathewson 
Date:   Tue Dec 20 18:23:13 2016 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 4dc5475e3d7d0877905fb87d48fab5003d9d5568
Merge: 0b571cf b18bde2
Author: Nick Mathewson 
Date:   Tue Dec 20 18:11:39 2016 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit a49be99eda66f5c6f16a877554f10de1107be001
Merge: f20ec6a 6c2174d
Author: Nick Mathewson 
Date:   Mon Nov 7 09:30:24 2016 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit f20ec6a322173618b783b333262dd2cdd04cca82
Merge: 28e42f6 12a7298
Author: Nick Mathewson 
Date:   Thu Oct 6 10:00:49 2016 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 28e42f6fff17e9440f6c3efb8817bd46f529fceb
Merge: f84a5e8 92891de
Author: Nick Mathewson 
Date:   Tue Jul 5 13:51:59 2016 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit f84a5e8a9184d6708b7deeb0fd00e2283e37429c
Merge: 4f7b4b2 c28ba99
Author: Nick Mathewson 
Date:   Tue Jul 5 12:25:17 2016 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/geoip-jun2016 |4 +
 changes/geoip-may2016 |4 +
 src/config/geoip  | 9624 +++--
 src/config/geoip6 | 2120 ---
 src/or/config.c   |3 -
 5 files changed, 7725 insertions(+), 4030 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 4f7b4b21b9052e619f1e3525b9fcf061290b28a8
Merge: 1f6b918 2ce99b9
Author: Nick Mathewson 
Date:   Thu Apr 7 10:46:39 2016 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug18089   | 6 +
 changes/bug18162   | 7 +
 changes/geoip-april2016| 4 +
 changes/geoip-february2016 | 4 +
 changes/geoip-march2016| 4 +
 src/common/container.c |37 +-
 src/common/crypto.c|10 +
 src/config/geoip   | 12867 ++-
 src/config/geoip6  |  2643 +++--
 9 files changed, 11316 insertions(+), 4266 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 1f6b918466100c019114eada95f3ff9610256953
Merge: 6ba5480 c7b0cd9
Author: Nick Mathewson 
Date:   Thu Jan 7 09:47:57 2016 -0800

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug17354   |4 +
 changes/bug17772   |7 +
 changes/bug17781   |3 +
 changes/bug17906   |4 +
 changes/geoip-december2015 |4 +
 changes/geoip-january2016  |4 +
 changes/geoip-october2015  |3 +
 src/config/geoip   |13046 +++-
 src/config/geoip6  | 3780 +++--
 src/or/config.c|2 +-
 src/or/main.c  |1 +
 src/or/routerlist.c|   10 +-
 12 files changed, 12399 insertions(+), 4469 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 9aa7ebca2903ba666a1c42c8902265a94caeff0d
Merge: 58c51dc 9d1801b
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Jul 12 16:37:33 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

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

diff --cc src/win32/orconfig.h
index 14c0f70,82e7e65..0bdaf92
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@@ -232,9 -232,10 +232,9 @@@
  #define USING_TWOS_COMPLEMENT
  
  /* Version number of package */
- #define VERSION 0.2.6.10
+ #define VERSION 0.2.6.10-dev
  
  
 -
  #define HAVE_STRUCT_SOCKADDR_IN6
  #define HAVE_STRUCT_IN6_ADDR
  #define RSHIFT_DOES_SIGN_EXTEND

___
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 3085343783d6914480dc71209f5441163ed8d4e2
Merge: aff4053 3d0c090
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Jul 12 13:33:52 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

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

diff --cc src/win32/orconfig.h
index fd59446,d8e5245..14c0f70
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@@ -232,9 -232,10 +232,9 @@@
  #define USING_TWOS_COMPLEMENT
  
  /* Version number of package */
- #define VERSION 0.2.6.9
+ #define VERSION 0.2.6.10
  
  
 -
  #define HAVE_STRUCT_SOCKADDR_IN6
  #define HAVE_STRUCT_IN6_ADDR
  #define RSHIFT_DOES_SIGN_EXTEND

___
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 2cdef2bb3417b4561559d7dab46165c220405c78
Merge: 23a9598 418b6f8
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Jul 10 11:54:49 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/geoip-june2015  |3 +
 changes/geoip6-june2015 |3 +
 src/config/geoip|14347 +++
 src/config/geoip6   | 2282 +---
 4 files changed, 8560 insertions(+), 8075 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 23a95986cee0479669ca49e3d2397238070d3fe9
Merge: d41ab97 1c1d71f
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Jun 25 11:20:11 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug16013  |5 +
 changes/bug16360-failed-crypto-early-init |7 ++
 changes/bug16363  |4 
 changes/bug16381  |   13 +++
 changes/bug16400  |5 +
 src/common/sandbox.c  |8 +++
 src/or/circuituse.c   |   12 ++
 src/or/main.c |2 +-
 src/or/rendcommon.c   |   10 +++--
 src/or/routerparse.c  |   14 +---
 src/test/test_microdesc.c |   34 +
 11 files changed, 108 insertions(+), 6 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[andrea]

commit 0e939c1e0021b40491789a082eec8ddb422ecc2d
Merge: 2f17b91 1eb2c0c
Author: Andrea Shepard and...@persephoneslair.org
Date:   Wed Jun 10 15:03:22 2015 +

Merge branch 'maint-0.2.6' into release-0.2.6

___
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 602e328dc33fec8eec976e497e04db810382b8b9
Merge: 2fe3afc 6785f0b
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Jun 8 10:42:25 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug16030|3 +++
 changes/bug16164|4 
 changes/bug16212|5 +
 changes/bug16244|7 +++
 changes/bug16247|5 +
 changes/ticket8243  |7 +++
 configure.ac|2 +-
 src/common/sandbox.c|   12 
 src/or/connection.c |4 ++--
 src/or/dirserv.c|6 --
 src/or/main.c   |2 +-
 src/test/test_channel.c |2 +-
 12 files changed, 52 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit a45526c230d91e037438566287fd212fa4510480
Merge: e1366d9 b3a225f
Author: Nick Mathewson ni...@torproject.org
Date:   Tue May 19 14:49:54 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

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|3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --cc src/win32/orconfig.h
index e9591e1,c0ab2de..466822e
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@@ -232,10 -232,10 +232,9 @@@
  #define USING_TWOS_COMPLEMENT
  
  /* Version number of package */
- #define VERSION 0.2.6.7
- 
+ #define VERSION 0.2.6.8
  
  
 -
  #define HAVE_STRUCT_SOCKADDR_IN6
  #define HAVE_STRUCT_IN6_ADDR
  #define RSHIFT_DOES_SIGN_EXTEND

___
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 39c056e207f6a0c624139bb7bdd8ad7e2810374c
Merge: c4e63b6 eb41214
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Apr 6 10:00:45 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 9ccf019b168909ef6674c71aebda9f90516bb6a1
Merge: 39c056e f620b8f
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Apr 6 10:03:26 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

___
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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit b3f24b5de37299d0db87ad8dd2138615ded94e66
Merge: db769b6 929a8f1
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Apr 3 09:52:57 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug11447 |5 +
 changes/bug15515 |4 
 src/or/or.h  |3 +++
 src/or/rendmid.c |   14 ++
 src/or/rendservice.c |2 +-
 5 files changed, 27 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 461a0de3ca04ee8e0f70c040e6d4f3b063150f34
Merge: bb8c4e6 b117a06
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Mar 25 14:09:35 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 configure.ac |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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit bb8c4e69ca5c8bcad7d66b2ad502ab35b1a5032b
Merge: 5ebe7f2 dfd6cf9
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Mar 24 10:23:44 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit e0b77cd3194d705f9bca254f8a95e520070ca365
Merge: eea9054 77c671b
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Mar 18 09:10:55 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit d8b2b1168e7d30c7f6f4c32b496a0a3c6e22a213
Merge: e0b77cd ca03b10
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Mar 18 16:32:26 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 7eb84e10e32f787ebddca6692431bf9c70a96073
Merge: 0f0b838 1a1d431
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Mar 12 12:11:03 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug15245 |5 +
 changes/bug9495_redux|4 
 src/common/compat_pthreads.c |6 +-
 src/common/container.h   |1 -
 src/or/cpuworker.c   |8 
 src/test/test_status.c   |6 --
 6 files changed, 26 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 4619fd4a20b5cb140189cb067a0a22497065230f
Merge: 7eb84e1 eb68ea2
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Mar 12 13:24:37 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug15240   |6 ++
 changes/ticket15212|6 ++
 src/or/channeltls.c|3 +++
 src/or/config.c|   13 +++--
 src/or/connection_or.c |1 +
 src/or/rephist.c   |   44 
 src/or/rephist.h   |4 
 src/or/status.c|4 +++-
 src/test/test_status.c |8 +++-
 9 files changed, 81 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 74f861b295fc59ae2567b5ec78e2a46d66e44630
Merge: 0c2e4ae 99b59de
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Mar 10 08:21:53 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit 98fa3956ac9d6aad165ee2c1d016cc582fe28d8e
Merge: cee716a 7c9be64
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Mar 9 16:25:22 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm]

commit ff1f6c417c53d905f47f26ea6b0fa9057a8c
Merge: 5e5b82f 1af67d7
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Mar 9 19:47:28 2015 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

 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