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

2019-12-19 Thread teor
commit 38cc3a45b655a07f8834ddcd1514f04b09bd80a0
Merge: 95caab8cc 37b04aeed
Author: teor 
Date:   Fri Dec 20 10:12:30 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 7 +++
 changes/ticket32240 | 4 
 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.9' into release-0.2.9

2019-12-15 Thread teor
commit 95caab8cc6962066a20390282afdd70ba6e6ec2b
Merge: e49ec773d 7dd594609
Author: teor 
Date:   Mon Dec 16 08:15:46 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 5 ++---
 changes/ticket32177 | 3 ---
 changes/ticket32629 | 4 
 3 files changed, 6 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2019-12-06 Thread nickm
commit e49ec773d1572eed2f02f83bba61d6383810d0a1
Merge: dac74fbfa b7b467d3a
Author: Nick Mathewson 
Date:   Fri Dec 6 16:02:06 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-12-03 | 4 +
 src/config/geoip | 13933 ++---
 src/config/geoip6|  4621 ---
 3 files changed, 10717 insertions(+), 7841 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.9' into release-0.2.9

2019-12-02 Thread teor
commit dac74fbfab4ca159a7fd4611afd2f131052565fd
Merge: 15a2c20e3 792c15fde
Author: teor 
Date:   Tue Dec 3 12:45:04 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 10 +++---
 changes/ticket32500 |  5 +
 2 files changed, 12 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.9' into release-0.2.9

2019-11-11 Thread nickm
commit 15a2c20e338e9e9cecfbb28a4d2aa14cd4c2a47d
Merge: d7f76b8c4 853b6ad09
Author: Nick Mathewson 
Date:   Mon Nov 11 10:14:02 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-11-06 | 4 +
 src/config/geoip | 15751 +++--
 src/config/geoip6|  3078 ++---
 3 files changed, 11485 insertions(+), 7348 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.9' into release-0.2.9

2019-11-05 Thread teor
commit d7f76b8c47ffd2512b9b454a2af87243e0f68993
Merge: 9343b4120 0650bf369
Author: teor 
Date:   Wed Nov 6 11:19:25 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug31107 |  4 
 changes/ticket31466  |  5 +
 src/or/channeltls.c  | 10 +-
 src/or/connection_edge.c |  8 +---
 4 files changed, 23 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.9' into release-0.2.9

2019-10-28 Thread teor
commit 9343b4120001ce788d11eae0d7f41340e93f044c
Merge: 79105b55b 752c35ca9
Author: teor 
Date:   Tue Oct 29 08:26:28 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 7 ---
 changes/ticket32241 | 2 ++
 2 files changed, 6 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.9' into release-0.2.9

2019-10-24 Thread teor
commit 79105b55b79ac1846a25de69c28d9f4b0e0111d1
Merge: 62194caa0 93be7275e
Author: teor 
Date:   Fri Oct 25 10:55:47 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml| 8 ++--
 changes/ticket31919_bionic | 5 +
 2 files changed, 11 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.9' into release-0.2.9

2019-10-22 Thread teor
commit 62194caa0565881178a784fe7662e5c9aa6c5b56
Merge: 14ba43f92 8682442c7
Author: teor 
Date:   Wed Oct 23 08:46:57 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml| 6 --
 changes/ticket31001| 6 ++
 changes/ticket31372_travis | 4 
 src/common/compat.c| 8 
 4 files changed, 18 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2019-10-22 Thread teor
commit 14ba43f92edf54343c7358d7c32f5f0993c9a5ae
Merge: 73b18f1f1 511aeba8e
Author: teor 
Date:   Tue Oct 22 20:46:08 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 5 +++--
 changes/ticket32177 | 3 +++
 2 files changed, 6 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.9' into release-0.2.9

2019-10-16 Thread teor
commit 73b18f1f12d1a43f6f0febc0ee6c15776bf11a1a
Merge: f99a64eea c660f4796
Author: teor 
Date:   Thu Oct 17 14:51:44 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 58 ++---
 changes/ticket30860 |  3 +++
 changes/ticket31859 |  3 +++
 3 files changed, 30 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.9' into release-0.2.9

2019-10-02 Thread nickm
commit f99a64eea6b24180bf58d66f3bd3d6dca55aaebd
Merge: 22605529b 90de776ea
Author: Nick Mathewson 
Date:   Wed Oct 2 08:01:33 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-10-01 | 4 +
 src/config/geoip | 35299 ++---
 src/config/geoip6|  8318 ---
 3 files changed, 26359 insertions(+), 17262 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.9' into release-0.2.9

2019-09-17 Thread nickm
commit 22605529b4a32a70d79b4de2e4b44a2e9b2fac1d
Merge: 324e01372 967460389
Author: Nick Mathewson 
Date:   Tue Sep 17 21:26:31 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/doc31089|   4 +
 contrib/operator-tools/tor-exit-notice.html | 177 +++-
 2 files changed, 176 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.9' into release-0.2.9

2019-09-17 Thread nickm
commit 324e01372ca618727ffdedd8e590c8f11f44b09c
Merge: ba7079fdd 484710f25
Author: Nick Mathewson 
Date:   Tue Sep 17 18:58:28 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket31673 | 3 +++
 src/common/compat.c | 8 +---
 2 files changed, 8 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.9' into release-0.2.9

2019-08-19 Thread nickm
commit ba7079fddf282f70085c3879c4e192f1af8bb578
Merge: f65c12351 5a1c3e44f
Author: Nick Mathewson 
Date:   Mon Aug 19 10:37:21 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket31406  | 3 +++
 src/or/auth_dirs.inc | 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.9' into release-0.2.9

2019-08-09 Thread teor
commit f65c123519f72da8f76c8f4d470165b07a86e6c1
Merge: 989909145 254c1bac4
Author: teor 
Date:   Sat Aug 10 07:25:30 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug28525 |  7 +++
 changes/bug30041 |  5 +
 changes/bug30561 |  6 ++
 changes/bug30781 |  4 
 changes/bug31343 |  9 +
 changes/ticket31374  |  4 
 src/common/address.c | 19 +++
 src/common/compat.c  | 17 +
 src/common/compat_time.c |  3 +--
 src/or/buffers.c |  4 +++-
 src/or/channeltls.c  | 23 +++
 src/or/connection.c  |  4 
 src/or/rephist.h |  4 +---
 src/or/routerlist.c  |  7 ---
 src/or/routerparse.c |  3 +++
 src/test/test_addr.c | 18 ++
 src/test/test_relay.c|  2 ++
 17 files changed, 118 insertions(+), 21 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.9' into release-0.2.9

2019-08-08 Thread teor
commit 989909145cecf3d3fad5434ae0bf4790792ad414
Merge: df54cfcce 8d22c09ab
Author: teor 
Date:   Thu Aug 8 11:05:01 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 40 +++-
 changes/chutney_ci  |  3 +++
 changes/ticket30213 |  3 +++
 3 files changed, 21 insertions(+), 25 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.9' into release-0.2.9

2019-07-01 Thread nickm
commit df54cfccee6cb5cbacc98a81c5940aaea88b34f7
Merge: 2626081e1 fb977f8ca
Author: Nick Mathewson 
Date:   Mon Jul 1 14:25:12 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket28795  |   5 +
 src/or/fallback_dirs.inc | 567 ++-
 2 files changed, 266 insertions(+), 306 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.9' into release-0.2.9

2019-06-11 Thread nickm
commit 2626081e1e9afe4400287e3981385129fff02e3a
Merge: fc0fa1594 0ec4ebd00
Author: Nick Mathewson 
Date:   Tue Jun 11 10:17:17 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-06-10 | 4 +
 src/config/geoip | 14985 +
 src/config/geoip6|  2391 ++--
 3 files changed, 9920 insertions(+), 7460 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.9' into release-0.2.9

2019-05-17 Thread nickm
commit fc0fa15945671a8d63d0c812856997f7440328c4
Merge: a0823d20e 4e262196a
Author: Nick Mathewson 
Date:   Fri May 17 08:10:15 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-05-13 | 4 +
 src/config/geoip | 15407 ++---
 src/config/geoip6|  3771 +++
 3 files changed, 11335 insertions(+), 7847 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.9' into release-0.2.9

2019-04-18 Thread teor
commit a0823d20eb94075ae75be3dbd9527f9ed1fdd0cf
Merge: ca0089066 2460b4461
Author: teor 
Date:   Fri Apr 19 11:56:25 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug23790 |  6 ++
 changes/bug29665 |  7 +++
 src/or/circuituse.c  |  5 -
 src/or/rendservice.c | 27 +++
 4 files changed, 44 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.9' into release-0.2.9

2019-04-05 Thread teor
commit ca0089066bcf3eedd59fd194413d8d4e740eb3e5
Merge: bcac0bb34 a0db5ade3
Author: teor 
Date:   Sat Apr 6 09:33:06 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 8 +---
 Makefile.am | 4 +++-
 changes/bug29036| 5 +
 changes/bug30021| 8 
 src/common/tortls.c | 2 +-
 5 files changed, 22 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.9' into release-0.2.9

2019-04-03 Thread nickm
commit bcac0bb342fd012bdf2e9a94b9fac5ae725e09ba
Merge: 37b0dd08a 54e249e26
Author: Nick Mathewson 
Date:   Wed Apr 3 09:27:42 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-04-02 | 4 +
 src/config/geoip | 10355 +
 src/config/geoip6|  2337 ++
 3 files changed, 7344 insertions(+), 5352 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.9' into release-0.2.9

2019-04-01 Thread teor
commit 37b0dd08aa4e7857687c732da19794ac5334df75
Merge: 3d1ff4732 f7688cb17
Author: teor 
Date:   Tue Apr 2 11:45:08 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug29703 |   4 +
 src/test/test-network.sh | 187 +--
 2 files changed, 54 insertions(+), 137 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.9' into release-0.2.9

2019-03-19 Thread teor
commit 3d1ff4732891535372e92c0d5bc1ae7b7b9a1405
Merge: 6dd377dd6 db2ac3b9f
Author: teor 
Date:   Wed Mar 20 09:47:51 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug29706_minimal  |  4 
 src/or/shared_random_state.c  |  4 ++--
 src/or/shared_random_state.h  |  2 ++
 src/test/test_shared_random.c | 17 ++---
 4 files changed, 22 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.9' into release-0.2.9

2019-03-13 Thread teor
commit 6dd377dd64b658853dab0b17bcdc34999c6cce10
Merge: 8cdb8f97a 8bd9b2a6a
Author: teor 
Date:   Thu Mar 14 06:39:49 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug23512|   6 +++
 changes/bug23681|   5 +++
 changes/bug25733|   4 ++
 changes/bug27073|   4 ++
 changes/bug28096|  13 ++
 src/common/compat.c |  95 +++-
 src/or/channeltls.h |   2 +
 src/or/circuitlist.c|  59 +
 src/or/circuitlist.h|   2 +
 src/or/circuitstats.c   |  20 -
 src/or/circuituse.c |  18 
 src/or/or.h |  12 +
 src/or/relay.c  |   1 +
 src/or/rephist.c|  26 ++-
 src/or/rephist.h|  10 +++--
 src/test/test_relay.c   | 113 +---
 src/test/test_threads.c |  30 -
 17 files changed, 345 insertions(+), 75 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.9' into release-0.2.9

2019-03-06 Thread nickm
commit 8cdb8f97ae4ecc11f2eb203382a32b777fbe2d36
Merge: f89eb4a02 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:26 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.9' into release-0.2.9

2019-02-28 Thread teor
commit f89eb4a021aa082f4385e6d912c07c8f88ac
Merge: 46b027b8b 7786198ee
Author: teor 
Date:   Fri Mar 1 14:15:30 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24903 | 5 +
 changes/bug25113 | 5 +
 changes/bug25116 | 4 
 src/or/circuituse.c  | 6 +++---
 src/or/control.c | 3 +++
 src/test/test_util.c | 8 
 6 files changed, 24 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2019-02-27 Thread teor
commit 46b027b8b768a37cbc27998052892d149d58efea
Merge: ec49580a7 4d9eb4dd0
Author: teor 
Date:   Thu Feb 28 10:45:22 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug29599  | 3 +++
 src/test/test_shared_random.c | 5 +++--
 2 files changed, 6 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.9' into release-0.2.9

2019-02-26 Thread teor
commit ec49580a74a938ccbe171efd33efde5eec3039bc
Merge: 935ac7107 4417ac880
Author: teor 
Date:   Wed Feb 27 09:37:27 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug29145| 3 +++
 src/test/test-memwipe.c | 3 ++-
 2 files changed, 5 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.9' into release-0.2.9

2019-02-12 Thread nickm
commit 935ac71079a21aeaf7a6488f567b436bc9850ea0
Merge: 46ab93ca7 a3f9ddcf0
Author: Nick Mathewson 
Date:   Tue Feb 12 09:56:48 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-02-05 | 4 +
 src/config/geoip | 22020 -
 src/config/geoip6|  2401 +++--
 3 files changed, 16972 insertions(+), 7453 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.9' into release-0.2.9

2019-01-23 Thread nickm
commit 46ab93ca7799e0ccab70d2f18432afd6c716
Merge: 06338dc60 dd6c2b0ad
Author: Nick Mathewson 
Date:   Wed Jan 23 09:49:26 2019 -0500

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

2019-01-18 Thread nickm
commit 06338dc605231d7c83b10a864d765a0fe5af79ec
Merge: ad70dd403 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 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.9' into release-0.2.9

2019-01-07 Thread nickm
commit ad70dd403bfe1fb5559588e16ff8bef231bce023
Merge: e403f8806 445d6750f
Author: Nick Mathewson 
Date:   Mon Jan 7 08:43:45 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-01-03 | 4 +
 src/config/geoip | 12599 ++---
 src/config/geoip6|  1764 ---
 3 files changed, 7458 insertions(+), 6909 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.9' into release-0.2.9

2019-01-04 Thread nickm
commit e403f880630d10ca1d154a05f6721b07d98354e2
Merge: 32ed15328 73de7b4bc
Author: Nick Mathewson 
Date:   Fri Jan 4 15:04:58 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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

2018-12-11 Thread nickm
commit 32ed153282026178da84c8ca6f80d82c97d15e0c
Merge: ef87966ec 3b5188576
Author: Nick Mathewson 
Date:   Tue Dec 11 10:00:22 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket24803 | 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.9' into release-0.2.9

2018-12-11 Thread nickm
commit ef87966ec022d66077d8832a616026bcc51d354b
Merge: 30ecd9096 4991b2931
Author: Nick Mathewson 
Date:   Tue Dec 11 09:41:04 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket24803  |   5 +
 src/or/fallback_dirs.inc | 581 ++-
 2 files changed, 333 insertions(+), 253 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.9' into release-0.2.9

2018-12-06 Thread nickm
commit 30ecd90961a1e878641b0fd054b82d8ab17a2318
Merge: ea890d7de 57798eb1c
Author: Nick Mathewson 
Date:   Thu Dec 6 09:26:31 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-12-05 | 4 +
 src/config/geoip | 10100 +++--
 src/config/geoip6|  3151 +-
 3 files changed, 8147 insertions(+), 5108 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.9' into release-0.2.9

2018-11-15 Thread nickm
commit ea890d7def3c3058f2aad7243118e80b5fa794df
Merge: 7651775b8 8569166c7
Author: Nick Mathewson 
Date:   Thu Nov 15 16:45:30 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24104|   4 ++
 src/or/rephist.c|   6 +-
 src/or/rephist.h|   4 +-
 src/or/router.c |  25 ++--
 src/test/include.am |   1 +
 src/test/log_test_helpers.c |  22 ++-
 src/test/log_test_helpers.h |   7 ++-
 src/test/test.c |   1 +
 src/test/test_router.c  | 142 
 9 files changed, 200 insertions(+), 12 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.9' into release-0.2.9

2018-11-13 Thread nickm
commit 7651775b8f4ce00b36735fbc0dc64102b4bbac87
Merge: 79443fd82 7f042cbc0
Author: Nick Mathewson 
Date:   Tue Nov 13 08:26:54 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug28413 | 4 
 src/common/aes.c | 5 ++---
 2 files changed, 6 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.9' into release-0.2.9

2018-11-11 Thread nickm
commit 79443fd82e560e89c8ee60746ea6f130ec63ce7a
Merge: 65d4551a3 46796623f
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 src/common/tortls.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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-11-11 Thread nickm
commit 65d4551a3fe7143a5ce82888542209dfb3390e60
Merge: 5689caeda 5ba3d09a8
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-11-06 | 4 +
 src/config/geoip | 22164 +++--
 src/config/geoip6|  2572 --
 3 files changed, 13068 insertions(+), 11672 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.9' into release-0.2.9

2018-11-09 Thread nickm
commit 5689caeda1090a77a46ee6d3cc97bec9ed7a74f7
Merge: 2a83cca83 45e0004b6
Author: Nick Mathewson 
Date:   Fri Nov 9 10:49:47 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug28245|  6 ++
 configure.ac|  1 +
 src/common/tortls.c | 17 +
 3 files changed, 24 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.9' into release-0.2.9

2018-10-31 Thread nickm
commit 2a83cca83b9016ec0005e2f7b6bfcac2345717f1
Merge: ed45a9534 0a824bd88
Author: Nick Mathewson 
Date:   Wed Oct 31 11:01:40 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27948|  6 ++
 src/test/bt_test.py | 10 ++
 2 files changed, 12 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.9' into release-0.2.9

2018-10-29 Thread nickm
commit ed45a95349e865023e2b2a1d6d2160d4500cfb33
Merge: 17d7095e1 0878bb961
Author: Nick Mathewson 
Date:   Mon Oct 29 15:57:30 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug28202 | 4 
 src/or/routerparse.c | 9 -
 2 files changed, 8 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.9' into release-0.2.9

2018-10-15 Thread nickm
commit 17d7095e117892fb32e4ba73ecbaee9f043df64f
Merge: 9a60e46ae 5b28190c6
Author: Nick Mathewson 
Date:   Mon Oct 15 12:47:46 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 src/common/util_bug.h | 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.9' into release-0.2.9

2018-10-15 Thread nickm
commit 9a60e46ae98cd8e33091bc339b2c50a407806bc3
Merge: dcb6924cd b11339965
Author: Nick Mathewson 
Date:   Mon Oct 15 10:34:41 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27709  |  4 
 src/common/util_bug.h | 57 +++
 2 files changed, 48 insertions(+), 13 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.9' into release-0.2.9

2018-10-10 Thread nickm
commit dcb6924cd5d50c39813fd46b22230497e2385439
Merge: 26df7c7f4 717507e3b
Author: Nick Mathewson 
Date:   Wed Oct 10 17:12:34 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 49 -
 changes/ticket27738 |  4 
 2 files changed, 32 insertions(+), 21 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.9' into release-0.2.9

2018-10-10 Thread nickm
commit 26df7c7f4a5b959ce0115fb4f38a29504ec677d0
Merge: 0392c104f 119df9c1c
Author: Nick Mathewson 
Date:   Wed Oct 10 11:34:48 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-10-09 | 4 +
 src/config/geoip | 38518 ++---
 src/config/geoip6|  1317 +-
 3 files changed, 30779 insertions(+), 9060 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.9' into release-0.2.9

2018-09-21 Thread nickm
commit 0392c104f888e4ad0cda8c6b696905c3a548250a
Merge: 9ba12d1a1 e24195c7c
Author: Nick Mathewson 
Date:   Fri Sep 21 09:35:23 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27316 |  3 +++
 src/or/protover.c| 15 +++
 src/test/test_protover.c |  4 
 3 files changed, 22 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.9' into release-0.2.9

2018-09-13 Thread nickm
commit 9ba12d1a1e938824cd499b65263fe159657df752
Merge: d96cef1ba c02f2d9eb
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27658   |  6 ++
 src/ext/tinytest.c | 12 ++--
 2 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/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-09-11 Thread nickm
commit d96cef1baa7b36125807b2cb95b70cccb3aa09b8
Merge: b69fe15b5 198b6354e
Author: Nick Mathewson 
Date:   Tue Sep 11 13:09:21 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 13 +++--
 changes/ticket27252 |  6 ++
 2 files changed, 17 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.9' into release-0.2.9

2018-09-11 Thread nickm
commit b69fe15b59f440eda3a99480f3aa4c9fbb603f54
Merge: 43c354d48 19429fac2
Author: Nick Mathewson 
Date:   Tue Sep 11 12:04:55 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-09-06 | 4 +
 src/config/geoip | 49324 +
 src/config/geoip6|  8574 
 3 files changed, 18629 insertions(+), 39273 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.9' into release-0.2.9

2018-09-10 Thread nickm
commit 43c354d48b442a6bb11982b8ee5117db2a8e9627
Merge: e057a19b7 b203dedaf
Author: Nick Mathewson 
Date:   Mon Sep 10 09:42:57 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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

2018-09-07 Thread nickm
commit ed8362718fdf04d149aaf4df2cd9e9dda3329e24
Merge: 00a9fafdb da29074fc
Author: Nick Mathewson 
Date:   Fri Sep 7 15:13:01 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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

2018-09-07 Thread nickm
commit 00a9fafdbabe71f56d37ff4bc69d3920278d380b
Merge: a1104a37a 1e46a391b
Author: Nick Mathewson 
Date:   Fri Sep 7 09:15:19 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27344| 4 
 configure.ac| 1 +
 src/common/tortls.c | 6 +-
 3 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-09-07 Thread nickm
commit a1104a37a2c33a292d24724d3b0ab66d4c569468
Merge: eb224270d 9fcb3ef78
Author: Nick Mathewson 
Date:   Fri Sep 7 08:46:45 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27461 | 5 +
 src/or/main.c| 8 
 2 files changed, 13 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.9' into release-0.2.9

2018-09-07 Thread nickm
commit eb224270d266a074f77782c37f4ada94aa2a43c8
Merge: d621078bf 912ae2b8d
Author: Nick Mathewson 
Date:   Fri Sep 7 08:44:39 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27463| 3 +++
 src/or/rendclient.c | 9 +
 2 files changed, 12 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.9' into release-0.2.9

2018-09-07 Thread nickm
commit d621078bfcac176a49afc5399e43e4e743761859
Merge: 9a767f00b 1570f17f9
Author: Nick Mathewson 
Date:   Fri Sep 7 08:42:19 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27465 | 5 +
 src/common/address.c | 5 -
 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.9' into release-0.2.9

2018-09-05 Thread nickm
commit 9a767f00be31985ed877e6086994e8405ec57356
Merge: 685232fe1 ff1486385
Author: Nick Mathewson 
Date:   Wed Sep 5 10:15:00 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml  | 2 +-
 changes/bug27418 | 3 +++
 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.9' into release-0.2.9

2018-09-05 Thread nickm
commit 685232fe1445d94b64c4e74864406f9c77a8592f
Merge: 5b072fd46 4e4b6a247
Author: Nick Mathewson 
Date:   Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml  | 6 +++---
 changes/bug27453 | 3 +++
 2 files changed, 6 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.9' into release-0.2.9

2018-08-29 Thread nickm
commit 5b072fd46982291cede10781f4aa0710d14d827d
Merge: 060f6f607 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 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.9' into release-0.2.9

2018-08-23 Thread nickm
commit 060f6f60792ca5c8062da3583cd281d827b7c5f7
Merge: 76be75b36 cc4ea34a2
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27185 |  3 +++
 src/test/test.c  | 10 ++
 2 files changed, 5 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-08-22 Thread nickm
commit 76be75b36721c18292a315e7a6adcb88950b6f09
Merge: 586a9ea83 9068e2fa2
Author: Nick Mathewson 
Date:   Wed Aug 22 09:37:31 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 src/or/connection_edge.c | 1 -
 src/test/test_tortls.c   | 3 +--
 2 files changed, 1 insertion(+), 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.9' into release-0.2.9

2018-08-21 Thread nickm
commit 586a9ea8321d3584f3a17216af865419cf057d81
Merge: 85d279e54 05d62a3b7
Author: Nick Mathewson 
Date:   Tue Aug 21 20:04:17 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml| 213 ++---
 changes/bug27088   |   5 ++
 changes/ticket24629|   3 +
 changes/ticket26560|   3 +
 changes/ticket26952-ccache |   3 +
 changes/ticket27087|   3 +
 6 files changed, 140 insertions(+), 90 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.9' into release-0.2.9

2018-08-21 Thread nickm
commit 85d279e540439ab5387365e4f9ecbbb33df10579
Merge: fea5c6d79 85a879234
Author: Nick Mathewson 
Date:   Tue Aug 21 19:16:40 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27226   |   5 +++
 src/common/tortls.c|  10 +++--
 src/test/test_tortls.c | 119 +
 3 files changed, 71 insertions(+), 63 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.9' into release-0.2.9

2018-08-15 Thread nickm
commit fea5c6d791973a524f2bc7fe39b4f62ffd98f413
Merge: fe4c08bb1 4c355ff18
Author: Nick Mathewson 
Date:   Wed Aug 15 12:20:57 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug27081 | 4 
 configure.ac | 6 --
 2 files changed, 8 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.9' into release-0.2.9

2018-08-09 Thread nickm
commit fe4c08bb158a3146cb6346b55dc2f94e6728e0fa
Merge: 7c97a87dd fe19b40fe
Author: Nick Mathewson 
Date:   Thu Aug 9 08:46:25 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-08-07 | 4 +
 src/config/geoip | 14291 ++---
 src/config/geoip6|   974 ++-
 3 files changed, 9063 insertions(+), 6206 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.9' into release-0.2.9

2018-08-08 Thread nickm
commit 7c97a87ddb0e40895aad432dd44b0f91160f5e3a
Merge: d5f0cbce9 27a2a6cb9
Author: Nick Mathewson 
Date:   Wed Aug 8 09:26:22 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug25440 | 5 +
 src/common/sandbox.c | 2 +-
 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.9' into release-0.2.9

2018-08-03 Thread nickm
commit d5f0cbce9016965e9e9cae459c2241bf0fa83cc8
Merge: 4632ad431 42c6ebda1
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20424_029_minimal | 4 
 configure.ac | 4 
 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/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-07-30 Thread nickm
commit 4632ad4314e8fa339a5c071e6e6a8a39d70f4bb5
Merge: 409d0cf8d 6443812e3
Author: Nick Mathewson 
Date:   Mon Jul 30 08:45:01 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26924   | 4 
 src/or/connection_or.c | 6 +-
 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.9' into release-0.2.9

2018-07-18 Thread nickm
commit 52df85fac422f3893a74612991f9488ef5d5910a
Merge: 535affe65 501deba8c
Author: Nick Mathewson 
Date:   Wed Jul 18 16:39:10 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 src/test/test_bt.sh | 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-07-18 Thread nickm
commit 409d0cf8d80decd6b1430df41ca83d382a937ad0
Merge: 52df85fac 93da2cae4
Author: Nick Mathewson 
Date:   Wed Jul 18 16:39:25 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26787 | 3 +++
 1 file changed, 3 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.9' into release-0.2.9

2018-07-18 Thread nickm
commit 535affe65692f6b00534e97d0c97cae67883a93a
Merge: 499612420 a321d7240
Author: Nick Mathewson 
Date:   Wed Jul 18 15:01:07 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26485|  4 
 src/or/config.c |  9 -
 src/or/dirserv.c| 43 +--
 src/or/dirserv.h|  3 +--
 src/or/dirvote.c|  9 -
 src/test/test_dir.c | 53 -
 6 files changed, 110 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/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-07-17 Thread nickm
commit 499612420495da4a41b169d5478c19a8e80280d2
Merge: ea2103812 6dafddd05
Author: Nick Mathewson 
Date:   Tue Jul 17 14:56:52 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26830| 3 +++
 src/test/test_keygen.sh | 8 
 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.9' into release-0.2.9

2018-07-12 Thread nickm
commit bb3f8445e36c439564def683a9c0493e51c65a44
Merge: 9d0c64cea cd4795ca3
Author: Nick Mathewson 
Date:   Thu Jul 12 14:32:16 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/task26771| 4 
 src/or/auth_dirs.inc | 4 ++--
 2 files changed, 6 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.9' into release-0.2.9

2018-07-09 Thread nickm
commit 9d0c64cead16f0c81fe402104f427a33025cab5c
Merge: 1905a83aa 8b53dfc36
Author: Nick Mathewson 
Date:   Mon Jul 9 10:14:43 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26269 |  5 +
 src/or/router.c  | 15 +--
 2 files changed, 14 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-07-09 Thread nickm
commit 1905a83aabf2d9c47492e510fc1deb25942aa5f8
Merge: 3e1717cd0 9faa28b60
Author: Nick Mathewson 
Date:   Mon Jul 9 09:11:41 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-07-03 |4 +
 src/config/geoip | 7171 --
 src/config/geoip6|  752 +++--
 3 files changed, 3732 insertions(+), 4195 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.9' into release-0.2.9

2018-07-03 Thread nickm
commit 3e1717cd0fe6ce45a74d05043dd28dbbeb2e66f3
Merge: 9fa7866c7 b205714ba
Author: Nick Mathewson 
Date:   Tue Jul 3 09:48:03 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26535.029 | 5 +
 src/test/ntor_ref.py | 9 ++---
 2 files changed, 11 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.9' into release-0.2.9

2018-06-29 Thread nickm
commit 9fa7866c7107f0104ab70df9d87d785d75fb92ea
Merge: efc851bac 1953a7e61
Author: Nick Mathewson 
Date:   Fri Jun 29 23:11:12 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 scripts/maint/checkSpace.pl | 6 --
 1 file changed, 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-06-29 Thread nickm
commit efc851bac660abb0d320b15a71f587f546e96e8f
Merge: 0580b2ee7 3c0a63c40
Author: Nick Mathewson 
Date:   Fri Jun 29 13:49:43 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 src/test/test_shared_random.c | 1 +
 1 file changed, 1 insertion(+)

___
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.9' into release-0.2.9

2018-06-29 Thread nickm
commit 0580b2ee77fc8b5a41c93c6309af26df3b88a02c
Merge: d02c5f739 890bc15ab
Author: Nick Mathewson 
Date:   Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket26467 | 3 +++
 1 file changed, 3 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.9' into release-0.2.9

2018-06-29 Thread nickm
commit d02c5f739ff8c5271fa8e7bf498a13283b5a7be3
Merge: e7b146736 b426e83f0
Author: Nick Mathewson 
Date:   Fri Jun 29 13:00:55 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 src/or/routerlist.c   | 2 ++
 src/or/shared_random_state.c  | 1 +
 src/test/test_hs.c| 7 +--
 src/test/test_shared_random.c | 1 +
 4 files changed, 9 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.9' into release-0.2.9

2018-06-26 Thread nickm
commit e7b146736f7014abb6dbce3e596ee5b94a1d5916
Merge: 2ef4bccb4 fcd26af7c
Author: Nick Mathewson 
Date:   Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/feature26372_029 | 4 
 configure.ac | 6 +-
 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.9' into release-0.2.9

2018-06-17 Thread nickm
commit 2ef4bccb487aabf9465f912bbb92a0ee455e4dde
Merge: 75732ef4c dd69e74e3
Author: Nick Mathewson 
Date:   Sun Jun 17 19:24:48 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .editorconfig | 33 +
 1 file changed, 33 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.9' into release-0.2.9

2018-06-12 Thread nickm
commit 75732ef4cd45fa822d80b7f95330c5447a2b3e9a
Merge: bded08415 ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 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.9' into release-0.2.9

2018-06-12 Thread nickm
commit bded08415c439f65c1b36c12410b72986541b207
Merge: 8dfd916a4 ae540569c
Author: Nick Mathewson 
Date:   Tue Jun 12 08:11:19 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-06-07 |4 +
 src/config/geoip | 5848 +-
 src/config/geoip6|  810 ++-
 3 files changed, 4354 insertions(+), 2308 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.9' into release-0.2.9

2018-06-08 Thread nickm
commit 8dfd916a4b2481258f9f7b0afa13d16104d5339f
Merge: 04eacc455 719b5c1d2
Author: Nick Mathewson 
Date:   Fri Jun 8 10:11:57 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26196  |  4 
 src/or/protover.c | 13 +
 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.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-05-24 Thread nickm
commit 04eacc45562de9075b861acd1b55c1f92b934329
Merge: 69a6763b3 c380562ae
Author: Nick Mathewson 
Date:   Thu May 24 09:40:06 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26116   |  7 +++
 src/common/crypto.c|  7 ++-
 src/test/test_crypto.c | 41 +
 3 files changed, 54 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.9' into release-0.2.9

2018-05-16 Thread nickm
commit 69a6763b370c072c6b82f4175157323e801a0ef5
Merge: 6ac0ec566 d1e4ffc71
Author: Nick Mathewson 
Date:   Wed May 16 12:11:45 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26072 | 5 +
 src/or/relay.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.9' into release-0.2.9

2018-05-15 Thread nickm
commit 6ac0ec566ebc5749cdb3786b78e3e58c1c065521
Merge: a1c06b84b 033e4723f
Author: Nick Mathewson 
Date:   Tue May 15 09:32:44 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-05-01 |4 +
 src/config/geoip | 5455 ++
 src/config/geoip6|  971 +++--
 3 files changed, 4468 insertions(+), 1962 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.9' into release-0.2.9

2018-05-10 Thread nickm
commit a1c06b84b31cbc1c7e0f57928de66d9d1159ce4a
Merge: 52bb38868 edb6acf9c
Author: Nick Mathewson 
Date:   Thu May 10 09:19:28 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 src/test/test_dir.c | 20 
 1 file changed, 20 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.9' into release-0.2.9

2018-05-10 Thread nickm
commit 52bb38868c32ff4d5120b93e6641ac62e8c887ab
Merge: add0306ca bca8a104b
Author: Nick Mathewson 
Date:   Thu May 10 08:00:35 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket26062| 3 +++
 src/or/networkstatus.c | 1 -
 2 files changed, 3 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.9' into release-0.2.9

2018-05-03 Thread nickm
commit add0306cab6d16225eb1ae195064994cd3d1d481
Merge: 7d509bc17 5227754b2
Author: Nick Mathewson 
Date:   Thu May 3 13:38:54 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml | 4 +++-
 Makefile.am | 9 +
 2 files changed, 12 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.9' into release-0.2.9

2018-05-02 Thread nickm
commit 7d509bc17027172ff3000fbd56216c672fe5ac08
Merge: edbfcee2f d465bd27e
Author: Nick Mathewson 
Date:   Wed May 2 08:46:28 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26007 |  5 +
 src/or/dirserv.c | 13 +++--
 2 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/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-04-24 Thread nickm
commit edbfcee2f252191a3892850d749a1416b4ae5357
Merge: 2fd489d61 34e7dca9c
Author: Nick Mathewson 
Date:   Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml  | 5 -
 changes/travis_distcheck | 4 
 2 files changed, 8 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.9' into release-0.2.9

2018-04-23 Thread nickm
commit 2fd489d61605197d5cc0e1c16d1d05a2da2fc73d
Merge: d5000fc67 9727b4c5d
Author: Nick Mathewson 
Date:   Mon Apr 23 09:23:31 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24969 | 3 +++
 src/common/sandbox.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.9' into release-0.2.9

2018-04-17 Thread nickm
commit d5000fc673c77e06db413a22d456621933e0bd1a
Merge: b83991fce d3ff12630
Author: Nick Mathewson 
Date:   Tue Apr 17 10:47:13 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml   | 9 -
 changes/coveralls | 3 +++
 2 files changed, 11 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.9' into release-0.2.9

2018-04-16 Thread nickm
commit b83991fce37aa35dc0b2790d7fa41de42806e793
Merge: 5a2232e62 0e13ff481
Author: Nick Mathewson 
Date:   Mon Apr 16 13:48:23 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 src/common/address.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.9' into release-0.2.9

2018-04-10 Thread nickm
commit 5a2232e62733aa6096f38271d883b9bedf63a87c
Merge: 8a363a7c8 10a1969ca
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:01 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug24854 |  3 +++
 src/or/auth_dirs.inc | 33 +
 src/or/config.c  | 34 +-
 src/or/include.am|  1 +
 4 files changed, 38 insertions(+), 33 deletions(-)

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


  1   2   3   >