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

[nickm]

commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0
Merge: c604a76a5 7d845976e
Author: Nick Mathewson 
Date:   Thu Dec 21 10:43:12 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit c604a76a53204eb20af0fab0a9f1f49fba393fd9
Merge: eecfed0cd 877dd1d6c
Author: Nick Mathewson 
Date:   Wed Dec 20 12:15:23 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit eecfed0cd2c8c92175106e211d1662fa43fc60bc
Merge: eaaa1108a f7151387d
Author: Nick Mathewson 
Date:   Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
Merge: 7e486dd6f bc1ea4f47
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 953a8f851081e6157e9296186c296ab10106b7eb
Merge: 495db72c1 f97f301b5
Author: Nick Mathewson 
Date:   Fri Dec 1 12:13:40 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 495db72c1eee7f9ed890ae252eb5b61a70438065
Merge: 73869c99a dc3890439
Author: Nick Mathewson 
Date:   Fri Dec 1 09:35:07 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 7e2b012b46a4ade2818e47be15d76255cf6f121e
Merge: 52d7af631 ba4a9cf0c
Author: Nick Mathewson 
Date:   Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug24313 |  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 |  8 +++-
 src/or/routerlist.c  |  5 -
 7 files changed, 53 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 1fd6e25522ed064e8043f4548fbd33fca9246295
Merge: 7e2b012b4 6ee447254
Author: Nick Mathewson 
Date:   Thu Nov 30 12:22:38 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 30b3229252709eeca054ee06cc6e366226723e24
Merge: 53c3174ee 25c90230b
Author: Nick Mathewson 
Date:   Mon Nov 27 09:09:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bastet_v6 | 4 
 src/or/config.c   | 1 +
 2 files 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d
Merge: 1b9bb2c84 d388f9d87
Author: Nick Mathewson 
Date:   Sat Nov 18 11:01:43 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 9666c620d584b2c715596b415a808941b17cbda0
Merge: 04d4786cc c9b76a12f
Author: Nick Mathewson 
Date:   Sat Nov 11 12:23:33 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 151d5ededf9fb334a5195904945f95cf626f51bc
Merge: 46091a88c faf568fa7
Author: Nick Mathewson 
Date:   Wed Oct 25 09:28:29 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 725f2371042b36c151a42e575a5b319d3820126c
Merge: 09d2ae562 912ebf165
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:17 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77
Merge: 1db5081ba a5f5bda46
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 src/test/test_config.c | 4 ++--
 1 file changed, 2 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 1db5081ba1e9201673dac296957a6d8b0a694855
Merge: c958fda6e 8cc147aa8
Author: Nick Mathewson 
Date:   Mon Oct 23 09:06:34 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit c958fda6e29265b12b987ee8445873c25629ae71
Merge: 132e2f69b 9a1b38546
Author: Nick Mathewson 
Date:   Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 132e2f69b1068b139d3c114fddd6efe58d6fc8f4
Merge: fcaf3335b 6f87a8589
Author: Nick Mathewson 
Date:   Mon Oct 23 08:53:25 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23690 | 5 +
 src/or/circuitlist.c | 1 +
 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 43ebe54a24d3210ef037f7e2b67fad9597361bab
Merge: 2984d9916 91c17ffbd
Author: Nick Mathewson 
Date:   Thu Oct 5 11:04:59 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 2984d991653b70fcd561d7d0bd693c46220cec74
Merge: 2c93be80d d6bdec159
Author: Nick Mathewson 
Date:   Thu Oct 5 11:03:35 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 2c93be80d9ad0712b5716c85e32f7a5184f3b1d2
Merge: 42e12a353 8e52c4658
Author: Nick Mathewson 
Date:   Wed Sep 20 08:32:55 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/longclaw-ipv6 | 6 ++
 src/or/config.c   | 1 -
 2 files changed, 6 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 42e12a3537fef04ab77defd6cb5581add439de43
Merge: a57f1ff7a 0a72d1c8f
Author: Nick Mathewson 
Date:   Mon Sep 18 14:40:22 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" to avoid version bump.




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 314652dc16ece380de343ccdc5a2155d612bcff7
Merge: f7b06202c 0ec72b030
Author: Nick Mathewson 
Date:   Mon Sep 18 09:39:46 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/trove-2017-008 | 5 +
 src/or/rendservice.c   | 4 ++--
 2 files changed, 7 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit f7b06202c787d117eb22f04798a6f3f4b6722af1
Merge: 3c6d4fe04 26f68dfce
Author: Nick Mathewson 
Date:   Thu Sep 14 13:21:28 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb
Merge: 969602159 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5
Merge: 58e1c6dd8 93b28972c
Author: Nick Mathewson 
Date:   Thu Aug 3 08:44:31 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 925ef048a977ccee0edb44ba68db2397b36d8c92
Merge: 24ddf5862 0e7558ab6
Author: Nick Mathewson 
Date:   Tue Aug 1 11:19:29 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit f17f7a4fdf1037a2cabe7c766231da244e30e692
Merge: f226d6460 5c5eb0f09
Author: Nick Mathewson 
Date:   Wed Jul 26 15:39:55 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 .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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit dcc477cb53cda792c433b01c21f45cd4415c984d
Merge: 0117e2ea0 fbf93614c
Author: Nick Mathewson 
Date:   Wed Jul 26 15:35:17 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 .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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit ed0fb218342dcf7cc54f6abd9078dcd3efa5452c
Merge: 4858cda 48e45e2
Author: Nick Mathewson 
Date:   Fri Jul 7 10:56:31 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug22838_028  | 5 +
 src/test/test_switch_id.c | 1 +
 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 4858cda2dfc61bb32269aea4f6978d6458fb
Merge: dfc0614 c1e4aff
Author: Nick Mathewson 
Date:   Fri Jul 7 10:51:28 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 32c0066e4baa2ca16902a70b941d8d3afbc279ff
Merge: bb97f68 5ff0f1a
Author: Nick Mathewson 
Date:   Wed Jul 5 13:43:21 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 711160a46f5fbba7106c23c29f99bed75928a5a7
Merge: 1c64133 3483f7c
Author: Nick Mathewson 
Date:   Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit cd7d006e0829ac83c1d9e5f04fff9ca239973014
Merge: 875b1fb 307be8d
Author: Nick Mathewson 
Date:   Fri Jun 9 09:58:46 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 875b1fbfba7bd4b1246c3d97b846e1ff77d0535a
Merge: 5e55421 6e90d75
Author: Nick Mathewson 
Date:   Thu Jun 8 14:06:28 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 8239af0d9cb3e45e4c5ff04ab057450934e306cf
Merge: b533220 bff08ed
Author: Nick Mathewson 
Date:   Thu Jun 8 09:29:12 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 987c7cae7073ba2c579cc81f973446831246858d
Merge: d561da1 d15d09a
Author: Nick Mathewson 
Date:   Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 80aca1501ae080ddb9c8f457290226dd5453b08a
Merge: d75be18 d850d27
Author: Nick Mathewson 
Date:   Mon Jun 5 14:49:46 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit d75be189df970f0da3a59f649e3be9c5d57868c6
Merge: ec61ae5 33fcc0f
Author: Nick Mathewson 
Date:   Mon Jun 5 12:02:15 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit a7bcab263959887b27500372bc6fa1fa0f8c947b
Merge: 8f5da80 5b45d73
Author: Nick Mathewson 
Date:   Tue May 16 08:38:59 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/ticket21564  |   6 ++
 src/or/fallback_dirs.inc | 179 +--
 2 files changed, 69 insertions(+), 116 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 5ff0b519ecee6e3d0b6d4550bd74f197a818b08d
Merge: 4a9f689 dc34cd7
Author: Nick Mathewson 
Date:   Mon May 8 08:07:32 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 7d7770f7359763871667e0150aebc50856f9d5fd
Merge: d642ceb 91c6b18
Author: Nick Mathewson 
Date:   Thu Apr 6 08:31:54 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit d642ceb8dff5e837bc0e27f9f50812beece06401
Merge: 7549259 2cfecec
Author: Nick Mathewson 
Date:   Wed Mar 8 10:12:06 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 3e07a54928c3b14b4eb86b05251564c3e16504c4
Merge: 67cec75 f93bcab
Author: Nick Mathewson 
Date:   Tue Feb 28 10:38:31 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

This is an "ours" merge to avoid taking a version bump




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit a1c3b391de98e73528d042a8b4c9d804b6d5bf57
Merge: 5d88267 5222054
Author: Nick Mathewson 
Date:   Wed Feb 15 07:52:54 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit eeb743588af0ec09150bd7601d553bfbabba97ac
Merge: 4a2afd5 1ebdae6
Author: Nick Mathewson 
Date:   Wed Feb 15 07:48:10 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/trove-2017-001.2 |  8 
 src/or/routerparse.c | 49 +---
 2 files changed, 38 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 4a2afd5b33f02ed3e5eb591dd29537fa4f69399f
Merge: a86f95d 9ff7618
Author: Roger Dingledine 
Date:   Mon Feb 13 15:41:20 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit a86f95df5c34df2921e8f3e76f171c0576fc2a20
Merge: 23f1caf 9b90d51
Author: Nick Mathewson 
Date:   Mon Feb 13 14:38:03 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 23f1caf2af300c55a33b7cb3f1671b0b9c2f73f2
Merge: 65cda78 eca4a89
Author: Nick Mathewson 
Date:   Tue Feb 7 10:39:23 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 65cda78ec6037da8059526d1c23449013f921ed2
Merge: a271ad2 a9f936d
Author: Nick Mathewson 
Date:   Tue Feb 7 09:30:19 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 3e5b1c2d95d2270d2e7b9e137c5ec04e0e534659
Merge: 946661d b60fb3a
Author: Nick Mathewson 
Date:   Tue Feb 7 09:20:52 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 946661d1dba09dda7af65a2cec8246be43299709
Merge: 0f46f7d 93ea18e
Author: Nick Mathewson 
Date:   Tue Feb 7 08:55:35 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 0f46f7d1ec8064ffc5573d60819fc7f231497e12
Merge: b928095 7b24f3e
Author: Nick Mathewson 
Date:   Tue Feb 7 08:39:39 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 0809690b481b37fae56a65171e6507e30e763bfa
Merge: c27ae62 c77ace6
Author: Nick Mathewson 
Date:   Wed Jan 11 09:13:34 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 490cd038693b89c30b60fd8682fd631f5581f458
Merge: a9bfa99 cb2e205
Author: Nick Mathewson 
Date:   Tue Dec 20 18:23:54 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit a9bfa997aeb33babc7bbcb314891122b07e6dbfa
Merge: 897d3c6 7f55aaf
Author: Nick Mathewson 
Date:   Tue Dec 20 18:15:56 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 8f043ffc647bf129e8a6d0c5991586fac880c489
Merge: 24318fb f62c74c
Author: Nick Mathewson 
Date:   Mon Dec 19 10:12:34 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

"Ours" merge to avoid version bump.




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit c9009ccf92d9a759d9135bcf872640f769f93a00
Merge: de65647 b838e1f
Author: Nick Mathewson 
Date:   Mon Dec 19 08:07:56 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit de656474611c43f24dd5fff430de945b34b738bf
Merge: 169a93f c11de4c
Author: Nick Mathewson 
Date:   Mon Dec 19 07:58:43 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug21018 | 11 +++
 src/or/rendcache.c   |  4 +++-
 src/or/routerparse.c |  6 +++---
 3 files changed, 17 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 169a93fff2510cf0eae76cdd198c19687bb1e875
Merge: 8384f4d e030632
Author: Nick Mathewson 
Date:   Mon Dec 19 07:30:42 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/ticket20170-v3   |   5 +
 src/or/fallback_dirs.inc | 392 ---
 2 files changed, 272 insertions(+), 125 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit adaf6a422af84a7402c2199d2c9be89a7e3f9e02
Merge: 9bb3bcb 56a2b8d
Author: Nick Mathewson 
Date:   Fri Dec 9 08:34:24 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit f9636ebc2f70544f8b86eb7e3a86a85c81349f8e
Merge: 5d4ff91 d47c52b
Author: Nick Mathewson 
Date:   Thu Dec 8 11:03:08 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

"Ours" merge to avoid bumping version.




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 5d4ff915cb2fda4fa416bfbe4d51387b81edac42
Merge: 9fe6ffa 4732e15
Author: Nick Mathewson 
Date:   Thu Dec 8 09:06:10 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit f602172dbaa9b0db49d6de993c9e13a48d12079f
Merge: e7ade23 10baf2c
Author: Nick Mathewson 
Date:   Wed Dec 7 18:28:09 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

(ours merge, to avoid taking 20865 fix)




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 0d0c7a11649db161070ab96310ff301be6dd704c
Merge: 907cd8a 2a36541
Author: Nick Mathewson 
Date:   Mon Dec 5 08:05:37 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 70d39859d63344ac7cce4f69cb6a7ad510a8cc32
Merge: cf762c6 1122137
Author: Nick Mathewson 
Date:   Fri Dec 2 11:20:27 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 82bd2af78df57206bdcc81e7343a78b7f07c4a1b
Merge: 52cb1ed 9157405
Author: Nick Mathewson 
Date:   Thu Dec 1 13:35:34 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9




___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 52cb1edda69b7f73b2aa7a8edfbc850a0b3769ff
Merge: f8a7972 16fcbd2
Author: Nick Mathewson 
Date:   Thu Dec 1 10:05:44 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug20235 |  4 
 configure.ac | 30 --
 2 files changed, 32 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit e4b793fe41fc09cc1f7753cfe90b74095a49a34f
Merge: d82ffb7 2639fd0
Author: Nick Mathewson 
Date:   Mon Nov 7 09:32:00 2016 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 59f4cae68c00e6b894e68d8cfefae295a8b9eb89
Merge: 3cd520a 61bdc45
Author: Nick Mathewson 
Date:   Thu Nov 3 18:36:43 2016 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug20551| 3 +++
 src/common/tortls.c | 8 
 2 files changed, 7 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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 3cd520a52d50b9e901d33d0164d847d12a278f1b
Merge: 3bb49c0 7a45ef5
Author: Nick Mathewson 
Date:   Thu Nov 3 15:44:46 2016 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug19969 | 10 ++
 src/or/connection_edge.c |  9 +
 src/or/main.c| 31 +++
 src/or/main.h|  2 ++
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --cc src/or/main.h
index 0220ae3,6949376..07b2259
--- a/src/or/main.h
+++ b/src/or/main.h
@@@ -45,10 -45,10 +45,12 @@@ int connection_is_writing(connection_t 
  MOCK_DECL(void,connection_stop_writing,(connection_t *conn));
  MOCK_DECL(void,connection_start_writing,(connection_t *conn));
  
+ void tell_event_loop_to_finish(void);
+ 
  void connection_stop_reading_from_linked_conn(connection_t *conn);
  
 +MOCK_DECL(int, connection_count_moribund, (void));
 +
  void directory_all_unreachable(time_t now);
  void directory_info_has_arrived(time_t now, int from_cache, int 
suppress_logs);
  

___
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.9] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm]

commit 3bb49c011006d042f8a3f802d7abb3e9da51b15b
Merge: ff3e08f 9b18b21
Author: Nick Mathewson 
Date:   Thu Nov 3 15:41:04 2016 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug20553| 3 +++
 src/common/crypto.c | 5 ++---
 src/tools/tor-gencert.c | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

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