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

2018-06-17 Thread nickm
commit f5b9e43d0db80a5d3e12491d2be23a2ea5f27e87
Merge: 7bcbd49ad 6107a2127
Author: Nick Mathewson 
Date:   Sun Jun 17 19:24:48 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-06-13 Thread nickm
commit 25ccecd0f0c72fd6f8e7a7ec1af4dfadac5a46ec
Merge: 2e3dce604 6017447e3
Author: Nick Mathewson 
Date:   Wed Jun 13 09:58:04 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug26158  | 5 +
 src/or/circuitbuild.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-13 Thread nickm
commit 7bcbd49ad824c1c343d7b26ed58d75ce062cb54c
Merge: 25ccecd0f 7e7585d0a
Author: Nick Mathewson 
Date:   Wed Jun 13 09:59:28 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug26158 | 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-13 Thread nickm
commit 2e3dce604ec8de261763bc49e5117952ab19c93c
Merge: c62ab5417 ff70cc84f
Author: Nick Mathewson 
Date:   Wed Jun 13 09:57:10 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25686_diagnostic | 4 
 src/or/directory.c  | 5 +++--
 src/or/router.c | 8 +++-
 3 files changed, 14 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-12 Thread nickm
commit c62ab5417e02082eb1cced26913495ae60597a5b
Merge: a5c1b17e1 53513e4bf
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-06-12 Thread nickm
commit a5c1b17e14402254ed162ca849914cb0103e49de
Merge: e1e914cd4 5d8a927aa
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-12 Thread nickm
commit e1e914cd4bcc2409ea32bac7b8c43710eb62ce9b
Merge: 14ec62f06 74ac463e7
Author: Nick Mathewson 
Date:   Tue Jun 12 08:11:20 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-06-08 Thread nickm
commit 14ec62f0640df3007e442e937428f2839f1eb745
Merge: 432620e44 dd63033fc
Author: Nick Mathewson 
Date:   Fri Jun 8 10:11:57 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-05-24 Thread nickm
commit 432620e44ed15364bf5404e0ad052f6c114a88aa
Merge: f3b53391e 3f3739c6e
Author: Nick Mathewson 
Date:   Thu May 24 09:40:06 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-05-16 Thread nickm
commit 79bee260eedc92f2009bfb3c780f397a05cd30cd
Merge: e8edd97c1 8340f641c
Author: Nick Mathewson 
Date:   Wed May 16 12:11:45 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-05-15 Thread nickm
commit e8edd97c1c579b6a3bd310781f4f97dfaa9459d5
Merge: e935e2767 4aa3d511b
Author: Nick Mathewson 
Date:   Tue May 15 09:32:44 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-05-10 Thread nickm
commit e935e2767676d86d9b36b6aafb439075a71feab0
Merge: 34d418009 7ee67c47f
Author: Nick Mathewson 
Date:   Thu May 10 09:22:32 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug26069   | 5 +
 src/or/hs_descriptor.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-05-10 Thread nickm
commit 34d418009d99931000870b535222e901ace52c1f
Merge: a15009bd3 15b8c860d
Author: Nick Mathewson 
Date:   Thu May 10 09:19:28 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-05-10 Thread nickm
commit a15009bd38cfc7ef9a426c25d40d2c7a8c6a2a80
Merge: 7e1102ff2 e5acbbd16
Author: Nick Mathewson 
Date:   Thu May 10 08:20:38 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-05-09 Thread nickm
commit 7e1102ff25ae23d86afe3eacac890eb7743fac16
Merge: a1243864f 394f102ea
Author: Nick Mathewson 
Date:   Wed May 9 11:53:18 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25761 | 3 +++
 src/or/hs_service.c  | 5 -
 src/or/rendservice.c | 5 +++--
 3 files changed, 6 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-05-03 Thread nickm
commit a1243864f263fdf9bc815ab31fa785f84d1b4b8d
Merge: 4b14ff45f be5b4415c
Author: Nick Mathewson 
Date:   Thu May 3 13:38:54 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-05-02 Thread nickm
commit 4b14ff45fd01912aada6ff34e32821c5dd1d59c1
Merge: fb4307bf2 246765342
Author: Nick Mathewson 
Date:   Wed May 2 08:46:28 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-04-25 Thread nickm
commit fb4307bf22067409ea7afd10178a4695490dc185
Merge: 7a55efbd5 7c3f87eb4
Author: Nick Mathewson 
Date:   Wed Apr 25 08:01:54 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/router.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-04-24 Thread nickm
commit 7a55efbd597ccc32f61234ad45abc96aa73521e4
Merge: 31e69ac22 89a3fafd4
Author: Nick Mathewson 
Date:   Tue Apr 24 10:38:37 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-04-24 Thread nickm
commit 31e69ac22278e381c4f46851d1977f6760089a12
Merge: 3abd57fa0 9187cdb1c
Author: Nick Mathewson 
Date:   Tue Apr 24 10:37:36 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25901| 3 +++
 src/or/hs_service.c | 4 
 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/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-04-24 Thread nickm
commit 3abd57fa0a59bd32b6e595870a7afad3a453dc18
Merge: ecb51bf9f d2951b381
Author: Nick Mathewson 
Date:   Tue Apr 24 08:49:24 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug23693.1 |  4 
 src/or/config.c| 10 +-
 src/or/main.c  |  2 +-
 src/or/router.c| 21 ++---
 4 files changed, 28 insertions(+), 9 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-04-23 Thread nickm
commit ecb51bf9f347ac7c1cf5b716543e0f79f0c50100
Merge: 65fd97375 1438c6c71
Author: Nick Mathewson 
Date:   Mon Apr 23 09:23:31 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-04-17 Thread nickm
commit 65fd973754592bb279e1b66ce226eb3e8362b815
Merge: 677789b68 f0230ee38
Author: Nick Mathewson 
Date:   Tue Apr 17 10:48:18 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-04-16 Thread nickm
commit 677789b680763d18ac1e81815b838ec32f3a37d0
Merge: a6f21a61d c5899d5cf
Author: Nick Mathewson 
Date:   Mon Apr 16 13:48:23 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 src/common/address.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-04-10 Thread nickm
commit a6f21a61d1a1893087c744935626a8dc75010385
Merge: bc250fcab d3ac47b41
Author: Nick Mathewson 
Date:   Tue Apr 10 14:26:32 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 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


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

2018-04-05 Thread nickm
commit bc250fcabd4cb5695a0c3725e24eb6a30e54c238
Merge: 955a7f52d 124e06e85
Author: Nick Mathewson 
Date:   Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-04-05 Thread nickm
commit 955a7f52d36e99a96df5e54a2a88dcc2b9931f62
Merge: 70bd4aae6 df519e5de
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 .travis.yml | 4 ++--
 changes/ticket25714 | 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-04-05 Thread nickm
commit 70bd4aae670bf48af0b83a3b14b2d841244b7e92
Merge: 6170f87e0 9b10eb2d7
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

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


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

2018-03-27 Thread nickm
commit 6170f87e01cc0d5f341c6a74ecb07f7f8838e6a5
Merge: 7dbaaba3d 0b795ce6d
Author: Nick Mathewson 
Date:   Tue Mar 27 18:25:21 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25629  |  3 +++
 src/or/nodelist.c | 28 ++--
 2 files changed, 17 insertions(+), 14 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-03-26 Thread nickm
commit 7dbaaba3d2912a695d6c8cfaa22d6880d7211e32
Merge: 109c555e9 b5a6c0399
Author: Nick Mathewson 
Date:   Mon Mar 26 10:29:29 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/feature25313 |  4 
 src/common/sandbox.c | 23 ++-
 2 files changed, 6 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-03-19 Thread nickm
commit 109c555e9d70dca4c4106d6d9fa0dcebdf0ff7ad
Merge: 36154c13f 66d312063
Author: Nick Mathewson 
Date:   Mon Mar 19 16:59:49 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 src/test/test_hs_service.c | 4 +++-
 1 file 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-03-19 Thread nickm
commit 36154c13f41f517c7629613d4b58cde23bb9ee1a
Merge: 75b544d64 bc0de600b
Author: Nick Mathewson 
Date:   Mon Mar 19 05:42:43 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

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


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

2018-03-19 Thread nickm
commit 75b544d64da0e273090d2f7ff98a67c9267cc37d
Merge: 2f397236b a0cc7e949
Author: Nick Mathewson 
Date:   Mon Mar 19 05:36:06 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25450   |  8 
 src/test/test_hs_service.c | 11 ++-
 2 files changed, 14 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-03-13 Thread nickm
commit 2f397236b21a30899c7334b509200744a2a74987
Merge: 4b067f8b1 d60dc2755
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Mar 13 10:59:30 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

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


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

2018-03-13 Thread nickm
commit 4b067f8b128f0c2c4b808d72793a394f628aac18
Merge: 4a03851e4 38b7885c9
Author: Nick Mathewson 
Date:   Tue Mar 13 10:58:03 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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

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


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

2018-03-13 Thread nickm
commit 4a03851e42afcb75525b4c4ca2331e75fb19fadf
Merge: 2d42648ea 094294dbb
Author: Nick Mathewson 
Date:   Tue Mar 13 13:42:06 2018 +0100

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25474 | 5 +
 configure.ac | 3 ++-
 2 files changed, 7 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-03-03 Thread nickm
commit 2d42648eaf0bfbf66957a427ff503d5d47d03bc5
Merge: 31cc63deb 0026d1a67
Author: Nick Mathewson 
Date:   Sat Mar 3 11:34:10 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-03-03 Thread nickm
commit bc8b5fb559be9044c7c32e7cdadbe02795b85e60
Merge: 43d44c04f d01abb934
Author: Nick Mathewson 
Date:   Thu Mar 1 16:07:59 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25249 |   3 +
 changes/bug25249.2   |   3 +
 changes/trove-2018-001.1 |   6 ++
 changes/trove-2018-004   |   8 +++
 src/or/protover.c|  35 --
 src/test/test_protover.c | 171 +++
 6 files changed, 220 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-03-03 Thread nickm
commit a9769b78f082b29d4b8a16f0f0a2f5d813656f6c
Merge: 499bdd81a 1ec386561
Author: Nick Mathewson 
Date:   Thu Mar 1 16:44:31 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-02-21 Thread nickm
commit 1c561819832883b869554614de90e3d13ef120a0
Merge: 434942ea5 bcfb03495
Author: Nick Mathewson 
Date:   Wed Feb 21 11:53:50 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 .gitmodules | 2 +-
 changes/ticket25323 | 4 
 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-16 Thread nickm
commit 434942ea59914eca2ac8e973ff021eaf439bde8f
Merge: cc1792264 bd71e0a0c
Author: Nick Mathewson 
Date:   Fri Feb 16 09:55:59 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24952|   5 +
 changes/bug25223|   4 +
 changes/ticket24902 |  13 +
 changes/ticket25122 |   4 +
 changes/ticket25202 |   4 +
 doc/tor.1.txt   |  95 ++
 src/common/address.c|  27 +-
 src/common/address.h|   2 +
 src/common/address_set.c| 129 +++
 src/common/address_set.h|  35 ++
 src/common/include.am   |   2 +
 src/common/log.c|   2 +-
 src/common/torlog.h |   4 +-
 src/or/channel.c|   9 +-
 src/or/channel.h|   3 +-
 src/or/channeltls.c |   2 +-
 src/or/command.c|  13 +
 src/or/config.c |  25 ++
 src/or/connection.c |  16 +
 src/or/dos.c| 794 
 src/or/dos.h| 140 
 src/or/geoip.c  | 205 ++--
 src/or/geoip.h  |  29 ++
 src/or/include.am   |   2 +
 src/or/main.c   |   2 +
 src/or/networkstatus.c  |   2 +
 src/or/nodelist.c   |  77 +
 src/or/nodelist.h   |   3 +
 src/or/or.h |  33 ++
 src/or/relay.c  |  14 +-
 src/or/rendmid.c|  12 +
 src/or/status.c |   2 +
 src/test/include.am |   2 +
 src/test/test.c |  20 ++
 src/test/test.h |   2 +
 src/test/test_address_set.c | 174 ++
 src/test/test_dos.c | 497 +++
 37 files changed, 2361 insertions(+), 43 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-16 Thread nickm
commit 7e664bf74ff4c2374d59d4a663799454bb86d10a
Merge: 4bfbce9de c8b087d90
Author: Nick Mathewson 
Date:   Fri Feb 16 08:47:41 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24898-029 | 6 ++
 1 file 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-16 Thread nickm
commit cc17922645ff9224d70ab8c6e5f53bc705119267
Merge: 7e664bf74 c67adddac
Author: Nick Mathewson 
Date:   Fri Feb 16 08:49:08 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24898-029 | 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-13 Thread nickm
commit 4bfbce9de7ac84259e8c27939cace2952e98d0e6
Merge: 6a35e7d69 cb9a322b6
Author: Nick Mathewson 
Date:   Tue Feb 13 16:55:19 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug21074_downgrade | 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-13 Thread nickm
commit 6a35e7d69abfc7394bb673a2e3c338cc4ee2c1dd
Merge: 3fda19ef2 b062730a1
Author: Nick Mathewson 
Date:   Tue Feb 13 08:50:59 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/ticket25170 |  5 +
 src/or/dirserv.c| 10 --
 2 files changed, 13 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-12 Thread nickm
commit 3fda19ef24a47b342d77e9a6167a11e9a4792165
Merge: 1a877693d 021c3bd58
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Feb 12 08:33:48 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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


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

2018-02-11 Thread nickm
commit 1a877693da774acea626acb4349a80010b058563
Merge: 2a24ce965 98fc8cd93
Author: Nick Mathewson <ni...@torproject.org>
Date:   Sun Feb 11 18:11:04 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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


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

2018-02-11 Thread nickm
commit 2a24ce9656cc36283b615b0da9e64c16adf36374
Merge: 9e81221c9 67043d957
Author: Nick Mathewson <ni...@torproject.org>
Date:   Sun Feb 11 18:09:35 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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


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

2018-02-11 Thread nickm
commit 9e81221c96793adfe3c46979ae4f749ff26e3644
Merge: cb3c1f2e5 684d57fe8
Author: Nick Mathewson 
Date:   Sun Feb 11 17:01:00 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug21074_downgrade |  4 
 src/common/compat.c| 14 +++---
 2 files changed, 11 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-10 Thread nickm
commit cb3c1f2e541c89789faa811be0a43b3288a4594c
Merge: 67127dca5 4de20d175
Author: Nick Mathewson 
Date:   Sat Feb 10 16:09:01 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24978   |  7 +++
 src/common/ciphers.inc | 21 -
 src/common/tortls.c| 28 +---
 3 files changed, 52 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-08 Thread nickm
commit 67127dca57fe63a9ded02db1e63dfbe166ca36d0
Merge: f5e37b2eb 84bc75b2e
Author: Nick Mathewson 
Date:   Thu Feb 8 10:29:06 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

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


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

2018-02-02 Thread nickm
commit f5e37b2eb6b33185a30a2aadd513c7e4dfbc1379
Merge: 90716e3f9 4ceae7c6b
Author: Nick Mathewson 
Date:   Fri Feb 2 12:03:54 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/scheduler.c| 26 +++---
 src/test/test_scheduler.c | 12 
 2 files changed, 27 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-01 Thread nickm
commit 90716e3f9ce3d5316d6d38323e2cc7c3125b576f
Merge: 1a4876587 77634795b
Author: Nick Mathewson 
Date:   Thu Feb 1 16:58:03 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24700|  4 
 src/or/channel.c|  3 +++
 src/or/scheduler.c  | 20 
 src/or/scheduler_kist.c | 14 ++
 4 files changed, 29 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-01 Thread nickm
commit 1a4876587eb351d51208c5dd93aa37a1e021b8cf
Merge: df37b9333 31542cc30
Author: Nick Mathewson 
Date:   Thu Feb 1 15:28:17 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25070  | 3 +++
 src/or/protover.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-02-01 Thread nickm
commit df37b933363cc720a24d1ce5ac70a576480abb25
Merge: a877241e6 61cb2993d
Author: Nick Mathewson 
Date:   Thu Feb 1 08:15:18 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24975  |  2 +-
 src/or/networkstatus.c| 36 +---
 src/or/scheduler.c|  5 ++---
 src/or/scheduler.h|  8 +++-
 src/or/scheduler_kist.c   | 20 
 src/test/test_scheduler.c | 16 
 6 files changed, 43 insertions(+), 44 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-31 Thread nickm
commit a877241e6c50cff72503a0179d8e4a9ed6216d57
Merge: 2485f8dea 56857291b
Author: Nick Mathewson 
Date:   Wed Jan 31 14:33:46 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25105 | 5 +
 src/or/routerparse.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-31 Thread nickm
commit 2485f8dea4182cf96696ef3e1b170337a41a5e39
Merge: c35416ab8 1c39d969b
Author: Nick Mathewson 
Date:   Wed Jan 31 13:47:01 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24975   |  6 ++
 src/or/networkstatus.c | 16 
 2 files changed, 18 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-31 Thread nickm
commit c35416ab8fbb360fded3db875eb252ba1a9b3273
Merge: 8dc3b5ff3 df312b3cf
Author: Nick Mathewson 
Date:   Wed Jan 31 12:51:45 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24976  | 5 +
 src/or/hs_cache.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-31 Thread nickm
commit 8dc3b5ff3aa3e78d2834c4ffdaf711d4849e24c3
Merge: da2daa8e5 9bfb6fe39
Author: Nick Mathewson 
Date:   Wed Jan 31 10:06:49 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/consdiffmgr.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-31 Thread nickm
commit da2daa8e5e6149b81a3c859db3be6409956c8857
Merge: 3d7f134be cb90defba
Author: Nick Mathewson 
Date:   Wed Jan 31 10:01:13 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/consdiffmgr.c | 6 --
 1 file changed, 4 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-31 Thread nickm
commit 3d7f134bea38b94a2454dcabe0ce6d32dbbd3059
Merge: 6b629d309 e81896add
Author: Nick Mathewson 
Date:   Wed Jan 31 09:50:24 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24859 | 4 
 src/or/consdiffmgr.c | 5 -
 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-31 Thread nickm
commit 6b629d30953b02857131f0f41fcb13964c0b33b3
Merge: 677bebda7 ee5c624be
Author: Nick Mathewson 
Date:   Wed Jan 31 09:19:55 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24972   |  4 
 src/or/hs_client.c |  6 --
 src/or/hs_descriptor.c |  9 ++---
 src/or/routerkeys.c| 11 ---
 src/or/torcert.c   | 21 -
 src/or/torcert.h   |  1 +
 6 files changed, 43 insertions(+), 9 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-24 Thread nickm
commit 677bebda7005ca9df960a4691c58f2cebb05035f
Merge: 03eb2037d 6ba2881ae
Author: Nick Mathewson 
Date:   Wed Jan 24 12:09:07 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25005  | 4 
 src/test/test_scheduler.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-19 Thread nickm
commit 03eb2037d11d2014044d9cc90f19d0d35e6045bf
Merge: 698334eee 129456e22
Author: Nick Mathewson 
Date:   Fri Jan 19 16:30:53 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24895 |  8 
 src/or/hs_circuit.c  |  7 ++-
 src/or/hs_common.c   | 17 +
 src/or/hs_common.h   |  2 ++
 src/or/rendservice.c |  4 ++--
 5 files changed, 35 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-19 Thread nickm
commit 698334eee7252c533882972aa8c734e3b674edaf
Merge: c9b4ddc88 e2aacf100
Author: Nick Mathewson 
Date:   Fri Jan 19 10:18:59 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 .travis.yml | 35 +++
 1 file changed, 31 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-18 Thread nickm
commit c9b4ddc882c93984359172e3e50f785080751558
Merge: 4bfc35579 44388757c
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-17 Thread nickm
commit 4bfc3557990c2b06cfb008c8a2af277df2ea40ba
Merge: b1267114c 4e653ac2c
Author: Nick Mathewson 
Date:   Wed Jan 17 11:12:33 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24898   |  8 
 src/or/command.c   |  6 --
 src/or/connection_or.c |  6 ++
 src/rust/Cargo.lock| 12 ++--
 4 files changed, 20 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-17 Thread nickm
commit b1267114cf5bf311a48f06b7eefb4c12c6b872d2
Merge: 7e9676782 f02c6bcad
Author: Nick Mathewson 
Date:   Wed Jan 17 10:50:58 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24894| 5 +
 src/or/hs_circuit.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-16 Thread nickm
commit 7e96767825f2c6bd60c1c4beae98e5158b1bdc15
Merge: dbea64aab 0cb89eb82
Author: Nick Mathewson 
Date:   Tue Jan 16 13:35:55 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 Makefile.am  |  3 ++-
 changes/bug24652 |  6 ++
 configure.ac | 11 +++
 3 files changed, 19 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-11 Thread nickm
commit dbea64aab67d2471653a6f8ce2b974e68df2ed11
Merge: 01d6e23f7 db5aa54a4
Author: Nick Mathewson 
Date:   Thu Jan 11 20:00:43 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24526|  4 
 doc/tor.1.txt   | 12 ++--
 src/config/torrc.minimal.in-staging |  6 ++
 src/config/torrc.sample.in  |  6 ++
 4 files changed, 26 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-09 Thread nickm
commit 01d6e23f767a029cc77cbe59b80046fcaad8401e
Merge: 9e8b762fc 34c6034aa
Author: Nick Mathewson 
Date:   Tue Jan 9 10:13:54 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-01-08 Thread nickm
commit 58474f7bb1e13ca61a0e52f13d8502cc334813bb
Merge: 5ff2d8d77 1f7f930f9
Author: Nick Mathewson 
Date:   Mon Jan 8 11:39:48 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-01-08 Thread nickm
commit 5ff2d8d7706f1f1d7790185b76ddfc8a7c575e01
Merge: efba81e3b 1c5c5f0e5
Author: Nick Mathewson 
Date:   Mon Jan 8 11:10:36 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-01-08 Thread nickm
commit efba81e3bb53ede274cbb139a15f318aab681d42
Merge: 0d172c118 748ad2124
Author: Nick Mathewson 
Date:   Mon Jan 8 09:35:55 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

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


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

2018-01-05 Thread arma
commit 0d172c1182bacb3c6d7e4538df87e706b720be30
Merge: 8edc0be74 5f2c7a856
Author: Roger Dingledine 
Date:   Fri Jan 5 18:26:14 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/common/crypto.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-05 Thread nickm
commit 8edc0be74baf61d5bd3db92106c83241289525c0
Merge: c7c043d2b 3618bd616
Author: Nick Mathewson 
Date:   Fri Jan 5 16:41:35 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-01-03 Thread nickm
commit c7c043d2b6f42893c220dbb2fd1991f4a34683b6
Merge: 1a070767d 9ef97a268
Author: Nick Mathewson 
Date:   Wed Jan 3 10:08:48 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24634  |  3 +++
 src/or/hs_common.c| 14 +++---
 src/or/hs_service.c   | 12 ++--
 src/test/test_hs_common.c |  6 +++---
 4 files changed, 19 insertions(+), 16 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-03 Thread nickm
commit 1a070767de0c50aed86f5fc3dc04324e03ef3d32
Merge: 99b4f8683 451c852a0
Author: Nick Mathewson 
Date:   Wed Jan 3 09:00:00 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2018-01-02 Thread nickm
commit 99b4f868332b3ae304e669240657994022d69991
Merge: fd46d8d0a 2aa1767b2
Author: Nick Mathewson 
Date:   Tue Jan 2 14:42:31 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/config/torrc.minimal.in-staging |  6 +-
 src/config/torrc.sample.in  | 13 +++--
 2 files changed, 16 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-01-02 Thread nickm
commit fd46d8d0ad9e976cdae7676e9f27f572b78ac959
Merge: 11336cfa0 707076002
Author: Nick Mathewson 
Date:   Tue Jan 2 10:10:28 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2017-12-21 Thread nickm
commit 11336cfa0997709176bc912fde71338eaeab3851
Merge: 63b84335d 94c59851d
Author: Nick Mathewson 
Date:   Thu Dec 21 14:23:06 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2017-12-21 Thread nickm
commit 63b84335dc590499e5f22498383d6a3432e91ec4
Merge: afacaa02a 1a7779966
Author: Nick Mathewson 
Date:   Thu Dec 21 12:42:22 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2017-12-21 Thread nickm
commit 0d1a2e366acd98fcece78c8b4734c5507059c366
Merge: 29e23e62c 6cd567d79
Author: Nick Mathewson 
Date:   Thu Dec 21 11:16:00 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24671|  6 ++
 src/or/scheduler_kist.c | 22 --
 2 files changed, 22 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-21 Thread nickm
commit 29e23e62c9be846ce68210d72448cf955a239d8c
Merge: 88642bbdc 84adb9fcc
Author: Nick Mathewson 
Date:   Thu Dec 21 10:58:20 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2017-12-21 Thread nickm
commit 2a7cad957263f5faed3a0b9de8b15d9794a5541c
Merge: c2b64ad09 885ba513f
Author: Nick Mathewson 
Date:   Thu Dec 21 10:20:35 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24665|  6 ++
 src/or/scheduler_kist.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/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-21 Thread nickm
commit 88642bbdc783d8616ba779dbd33378e2c4e09501
Merge: 2a7cad957 c38157be9
Author: Nick Mathewson 
Date:   Thu Dec 21 10:27:39 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/scheduler_kist.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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-20 Thread nickm
commit c2b64ad0968f040e2b5ecb426d3520a02acb5cc7
Merge: 748f0abc2 7e45720cf
Author: Nick Mathewson 
Date:   Wed Dec 20 12:15:24 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2017-12-20 Thread nickm
commit 748f0abc2d6b1c2da41d269882aabdcf5819b1ab
Merge: 2824413f4 565ec6100
Author: Nick Mathewson 
Date:   Wed Dec 20 11:19:23 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/common/tortls.c | 9 ++---
 1 file 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-20 Thread nickm
commit 2824413f40e20bb1c02eb6e180208eca203645f3
Merge: 64c88c719 0a1b1430c
Author: Nick Mathewson 
Date:   Wed Dec 20 10:39:38 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/test/test_hs_common.c | 6 +++---
 1 file 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-20 Thread nickm
commit 64c88c71995b5320d3951496b9b8f01ed2cf4a7b
Merge: 4f8a0ed62 fc33caada
Author: Nick Mathewson 
Date:   Wed Dec 20 09:59:51 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/ticket24425 | 4 
 src/or/hs_common.h  | 2 +-
 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-14 Thread nickm
commit 0f105d69fc79aae00df305a7a76a74652ebab947
Merge: 2b48b5363 5c4da2cac
Author: Nick Mathewson 
Date:   Thu Dec 14 14:12:49 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2017-12-13 Thread nickm
commit 0834f4d93dc808bc2f01350635719551762fee69
Merge: 4c015d9fe ca8e9813b
Author: Nick Mathewson 
Date:   Wed Dec 13 12:07:46 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 .gitignore | 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-13 Thread nickm
commit 4c015d9fe4abf54f5e3d8929fa62b916789e158f
Merge: 37fba82c1 93b3c4b84
Author: Nick Mathewson 
Date:   Wed Dec 13 12:06:52 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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

2017-12-12 Thread nickm
commit 37fba82c155dda2ba5d4b3bdd63ea4cd54f264ee
Merge: dc9f2cdf7 15b41fa6a
Author: Nick Mathewson 
Date:   Tue Dec 12 19:46:53 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24424 | 3 +++
 src/common/sandbox.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/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-12 Thread nickm
commit dc9f2cdf73a4a55288f2321aa78b72ea188fedec
Merge: dd5ca2505 bf89b0893
Author: Nick Mathewson 
Date:   Tue Dec 12 19:27:14 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24367   | 13 +
 src/or/bridges.c   | 38 +++---
 src/or/bridges.h   |  1 -
 src/or/circuituse.c| 15 ---
 src/or/directory.c |  9 +
 src/or/entrynodes.c| 26 --
 src/or/entrynodes.h|  3 +--
 src/or/networkstatus.c |  4 +++-
 src/test/test_dir.c| 22 --
 9 files changed, 73 insertions(+), 58 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-12 Thread nickm
commit dd5ca2505599dee6a589e228b69c4e8d4f29d7e6
Merge: 706e6893d cf5ab5934
Author: Nick Mathewson 
Date:   Tue Dec 12 09:32:29 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/hs_service.c | 50 +-
 1 file changed, 33 insertions(+), 17 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.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2017-12-12 Thread nickm
commit 58f974818c6fc9452bbdbe78d82ed10bdcbbae7e
Merge: 2cfb7b041 4593f5a6e
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Dec 11 16:56:31 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2




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


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

2017-12-12 Thread nickm
commit 706e6893d16e2097d9da4511060372c21f1cd24b
Merge: 58f974818 4c54021ba
Author: Nick Mathewson 
Date:   Tue Dec 12 09:13:12 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug23682 | 5 -
 1 file changed, 5 deletions(-)

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


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

2017-12-11 Thread nickm
commit 2cfb7b0413d7f1e0b3c5004c8c2877c53b39244b
Merge: a14ff6b9c 43fb8fc5c
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Dec 11 16:54:14 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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


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

2017-12-11 Thread nickm
commit a14ff6b9c71ee4891b9c992821a63d2df09fcd38
Merge: d77e82769 e553bf3ce
Author: Nick Mathewson <ni...@torproject.org>
Date:   Mon Dec 11 16:51:58 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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


  1   2   >