[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-19 Thread nickm 
commit b39c50cde8b1d7e3e27d5a6fc2e58ff208982637
Merge: 1cf11b694 a2aaf9509
Author: Nick Mathewson 
Date:   Fri Jan 19 16:29:43 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 Conflicts:
src/or/rendservice.c

 changes/bug24895 |  8 
 src/or/rendservice.c | 26 --
 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-19 Thread nickm 
commit 1cf11b69408ab3707de01711308a05e223a767f5
Merge: b85fa0bd5 36567c5ca
Author: Nick Mathewson 
Date:   Fri Jan 19 10:17:05 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 .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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-08 Thread nickm 
commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7
Merge: 8042c356f 9464da210
Author: Nick Mathewson 
Date:   Mon Jan 8 11:10:36 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket_24801 |   5 +
 src/or/fallback_dirs.inc | 968 ++-
 2 files changed, 717 insertions(+), 256 deletions(-)



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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-08 Thread nickm 
commit 8042c356f4904107b0357d95d19f2c72f1d13cb5
Merge: 16fd975a8 26e28829d
Author: Nick Mathewson 
Date:   Mon Jan 8 09:34:56 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-05 Thread nickm 
commit 16fd975a82e502418578c81f04894272c4f11826
Merge: bbc9ff160 c52d4d9e3
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:34 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket24681 | 6 ++
 doc/tor.1.txt   | 3 ++-
 src/or/config.c | 9 -
 3 files changed, 16 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-03 Thread nickm 
commit bbc9ff160e7071b7a2fa9ab200b6496580975b06
Merge: 8a7767603 c9b3f6352
Author: Nick Mathewson 
Date:   Wed Jan 3 08:59:59 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24633  | 5 +
 src/ext/timeouts/timeout-bitops.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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2018-01-02 Thread nickm 
commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6
Merge: 03b4dd92a 6e5e4f92a
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24736  | 6 ++
 src/or/policies.c | 2 ++
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-21 Thread nickm 
commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267
Merge: 08ed0d793 79a50afa0
Author: Nick Mathewson 
Date:   Thu Dec 21 10:49:40 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24666   |  7 
 src/or/circuitmux.c| 34 ++--
 src/or/circuitmux.h|  2 +-
 src/or/or.h| 15 +
 src/or/relay.c | 79 --
 src/or/relay.h |  8 +
 src/test/test_circuitmux.c | 12 +++
 7 files changed, 123 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-20 Thread nickm 
commit 08ed0d79308b308f690b80d65b22be11a97caf09
Merge: d3b7a2bd2 c604a76a5
Author: Nick Mathewson 
Date:   Wed Dec 20 12:15:24 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-12 Thread nickm 
commit da38904efbdd0c2c6b754aed7f75201e3c1cd97a
Merge: 2ea573ece eecfed0cd
Author: Nick Mathewson 
Date:   Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm 
commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-11 Thread nickm 
commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson 
Date:   Mon Dec 11 16:51:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23985| 9 +
 src/or/routerlist.c | 5 +
 2 files changed, 14 insertions(+)




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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-01 Thread nickm 
commit 3bca705c544bd56ade5a25022b51d395f038444f
Merge: 6e3ec8222 953a8f851
Author: Nick Mathewson 
Date:   Fri Dec 1 12:13:40 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-01 Thread nickm 
commit 6e3ec8222c6b2b3eec332ef3b5d3b0eac0c00ce5
Merge: 1983068ba 495db72c1
Author: Nick Mathewson 
Date:   Fri Dec 1 09:35:16 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

"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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-01 Thread nickm 
commit 8f36104574a6dcce6e6dbb9b49e1f3766ab56441
Merge: 5fc0587c0 16c9cfd65
Author: Nick Mathewson 
Date:   Thu Nov 30 12:24:13 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0




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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-12-01 Thread nickm 
commit 5fc0587c040339357bc3fc37f1b5474f1c3d1a33
Merge: d459c08b7 7e2b012b4
Author: Nick Mathewson 
Date:   Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug24313 |  5 +
 changes/trove-2017-009   | 10 ++
 changes/trove-2017-010   |  6 ++
 changes/trove-2017-011   |  8 
 changes/trove-2017-012-part1 |  6 ++
 src/common/crypto.c  | 16 +---
 src/or/protover.c|  5 +
 src/or/rendservice.c |  8 +++-
 src/or/routerlist.c  |  5 -
 9 files changed, 64 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-30 Thread nickm 
commit 766d0a2d98591ed840cce42710c5a59a2e7dc731
Merge: b1c4ab0be 072e194a1
Author: Nick Mathewson 
Date:   Thu Nov 30 11:48:12 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug21394 |  9 +
 src/or/dns.c | 23 ---
 2 files changed, 29 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-18 Thread nickm 
commit 2d849716df357b570eaf4557638f63a9b2d8a6c1
Merge: 50fbede45 53c3174ee
Author: Nick Mathewson 
Date:   Sat Nov 18 11:02:08 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-13 Thread nickm 
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-13 Thread nickm 
commit 16bdb9e365ff43885a4d3b3478ebb224f5a26a33
Merge: 9092e9019 ab415ae95
Author: Nick Mathewson 
Date:   Mon Nov 13 11:18:02 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23470   |  6 ++
 src/or/directory.c | 22 +++---
 2 files changed, 17 insertions(+), 11 deletions(-)




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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-13 Thread nickm 
commit 9092e9019a111608b34dd6594d599d4ca464c36d
Merge: ece63105d 53758
Author: Nick Mathewson 
Date:   Mon Nov 13 11:15:50 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug8185_025 |  6 ++
 src/or/relay.c  | 11 +++
 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-13 Thread nickm 
commit ece63105d9157fa432cc59d8b828ca23a80040ff
Merge: 5348c8996 c928fb988
Author: Nick Mathewson 
Date:   Mon Nov 13 11:13:22 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket21953 |  6 ++
 src/or/main.c   | 10 +-
 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-11 Thread nickm 
commit 5348c8996f53964ce7466f00acad33f625191983
Merge: f2e23d38a 9666c620d
Author: Nick Mathewson 
Date:   Sat Nov 11 12:23:33 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-31 Thread nickm 
commit f2e23d38ab109ea8d5be0d6b9e9edad4528ff68a
Merge: 6ce8cc5db 04d4786cc
Author: Nick Mathewson 
Date:   Tue Oct 31 11:43:14 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23693 | 6 ++
 src/or/config.c  | 1 +
 2 files changed, 7 insertions(+)




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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-25 Thread nickm 
commit 6ce8cc5dbba52c2a5e60d4311e8b9cfe684f210e
Merge: 4edbbee2f 151d5eded
Author: Nick Mathewson 
Date:   Wed Oct 25 09:28:41 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm 
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25
Merge: 5325e7cca 552b62028
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:24 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm 
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f
Merge: d913a7317 725f23710
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:24 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm 
commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1
Merge: eac4c374e b1bd1bf19
Author: Nick Mathewson 
Date:   Mon Oct 23 15:55:08 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23874  | 3 +++
 src/or/nodelist.c | 5 +
 2 files changed, 8 insertions(+)




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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm 
commit eac4c374e456af4f216392ec2d3b037d5f57e2f3
Merge: c93ecb818 fcd5c3144
Author: Nick Mathewson 
Date:   Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm 
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa
Merge: 783e458c0 1db5081ba
Author: Nick Mathewson 
Date:   Mon Oct 23 09:06:34 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm 
commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a
Merge: 74e8fd22c c958fda6e
Author: Nick Mathewson 
Date:   Mon Oct 23 08:59:11 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm 
commit 74e8fd22c9971a7184d74d2775ca1c575e54e08f
Merge: 35574d4a9 132e2f69b
Author: Nick Mathewson 
Date:   Mon Oct 23 08:53:25 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 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/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm 
commit 35574d4a9ad1ce0fb40d3c06493276a71990ac48
Merge: d29e4c059 fcaf3335b
Author: Nick Mathewson 
Date:   Mon Oct 23 08:47:58 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23081 | 8 
 src/or/ntmain.c  | 1 +
 2 files changed, 9 insertions(+)



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

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm 
commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22
Merge: f7f55acae 68dea082e
Author: Nick Mathewson 
Date:   Mon Oct 23 08:46:29 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug22349 |  9 +
 src/or/dirserv.c | 56 
 2 files changed, 53 insertions(+), 12 deletions(-)




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