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

2019-01-18 Thread nickm
commit b655e77ec5d8d793e4313e7dd24da1d5c8e9e898
Merge: 9609d1325 4cca7fb99
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2019-01-07 Thread nickm
commit 7b792b990c49ddbca782ee342bc6b0805b3f0868
Merge: 801af9a7e b5fdb91ad
Author: Nick Mathewson 
Date:   Mon Jan 7 21:18:47 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2019-01-07 Thread nickm
commit 8eaa8631794cce7d4a5f0713360cbc3bbaf4b199
Merge: 2d279eaa9 63eed6edf
Author: Nick Mathewson 
Date:   Mon Jan 7 10:23:40 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2019-01-07 Thread nickm
commit 0c75f83625864779aac92684fb9b764e05adf135
Merge: cba5c8829 ba71b1786
Author: Nick Mathewson 
Date:   Mon Jan 7 08:43:45 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2019-01-04 Thread nickm
commit cba5c8829dd22885764d2d1340fb1ea9c16117c0
Merge: dbef7af12 fee2eaf2d
Author: Nick Mathewson 
Date:   Fri Jan 4 15:04:58 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2019-01-04 Thread nickm
commit dbef7af12c68965b68cf2157e4fc18fd6fc7acf6
Merge: d6552a7a2 bf8bb9c52
Author: Nick Mathewson 
Date:   Fri Jan 4 14:57:06 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug28619| 6 ++
 src/or/hs_service.c | 6 --
 2 files changed, 10 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2019-01-03 Thread nickm
commit d6552a7a23da31e92e84d1a3b442dfb8acb2df80
Merge: fd2d7c5d1 1ea312718
Author: Nick Mathewson 
Date:   Thu Jan 3 09:02:39 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket28973|  6 ++
 src/common/tortls.c| 46 +-
 src/or/connection_or.c | 17 ++---
 3 files changed, 61 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-12-11 Thread nickm
commit fd2d7c5d1993b6ff174b705cc0e07e9f0b707685
Merge: 8be8cc50e 93019b478
Author: Nick Mathewson 
Date:   Tue Dec 11 10:00:22 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-12-11 Thread nickm
commit 8be8cc50ed86fe939d7d32e364a5193e34178216
Merge: 12b68854a c1f919158
Author: Nick Mathewson 
Date:   Tue Dec 11 09:41:05 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-12-06 Thread nickm
commit 12b68854a0055ffd697ddf07abb038ed586feb30
Merge: 8c1eb28d6 00341d97f
Author: Nick Mathewson 
Date:   Thu Dec 6 09:26:32 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-12-01 Thread nickm
commit 8c1eb28d610706d15e97531d778e78173d6701b1
Merge: b3235e21a ffc7b81b5
Author: Nick Mathewson 
Date:   Sat Dec 1 11:15:09 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug28554   | 3 +++
 src/test/test_entrynodes.c | 5 -
 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-11-15 Thread nickm
commit b3235e21ab3dc2d31e6bd5a874290675ff4756bf
Merge: e8708c2fb cbe04d455
Author: Nick Mathewson 
Date:   Thu Nov 15 16:56:11 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug24104|   4 ++
 src/or/rephist.c|   7 ++-
 src/or/rephist.h|   5 +-
 src/or/router.c |  25 +++--
 src/test/log_test_helpers.c |  23 +++-
 src/test/log_test_helpers.h |   8 ++-
 src/test/test_router.c  | 124 +++-
 7 files changed, 179 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-11-15 Thread nickm
commit e8708c2fbdbdcd751de74991f5bd1d15cc296362
Merge: b120d8b83 aebe8a82c
Author: Nick Mathewson 
Date:   Thu Nov 15 16:47:25 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket26913 |  7 +++
 doc/tor.1.txt   |  6 --
 src/or/config.c | 21 +++--
 3 files changed, 30 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-11-15 Thread nickm
commit b120d8b8365641ead5f0cfc659613ac95bee1123
Merge: cca803e2b 34e4d5a78
Author: Nick Mathewson 
Date:   Thu Nov 15 16:37:41 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket27550| 5 +
 src/or/directory.c | 2 +-
 src/or/hs_client.c | 4 
 src/or/hs_descriptor.c | 9 ++---
 4 files changed, 12 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-11-14 Thread nickm
commit cca803e2b01a107f569433a85dd62f20c7803f27
Merge: 15c99be96 db3acb3aa
Author: Nick Mathewson 
Date:   Wed Nov 14 07:55:07 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug28419   | 3 +++
 src/tools/tor_runner.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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-11-13 Thread nickm
commit 15c99be9637fd6c3dfc9f45a24fd06054dffd140
Merge: c079be8c7 54d1a2d80
Author: Nick Mathewson 
Date:   Tue Nov 13 08:27:28 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-11-11 Thread nickm
commit c079be8c7d73110577ef5d16cc7e40d9789627ef
Merge: c15a556a9 93b6d4137
Author: Nick Mathewson 
Date:   Sun Nov 11 18:05:45 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-11-11 Thread nickm
commit c15a556a98f368794041b2efe89808908b818f6b
Merge: 93cf98cbb d0c3723c3
Author: Nick Mathewson 
Date:   Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-11-09 Thread nickm
commit 93cf98cbb160f31804d129e6e3e33355883fc1b2
Merge: dd0b85179 c06b7f090
Author: Nick Mathewson 
Date:   Fri Nov 9 10:49:47 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-11-02 Thread nickm
commit dd0b8517940a62827498d1f930afa491f0edc612
Merge: e0f4e6a2e 6bd069630
Author: Nick Mathewson 
Date:   Fri Nov 2 09:06:37 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26470 | 4 
 src/or/connection_edge.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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-11-02 Thread nickm
commit e0f4e6a2eb0c36b47aa4540926bdf441ecc9873b
Merge: 73eebf4c8 e847909b7
Author: Nick Mathewson 
Date:   Fri Nov 2 09:04:25 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket27410 | 5 +
 src/or/hs_client.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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-31 Thread nickm
commit 73eebf4c8e763a6f308b7ee457ff10e89376bcd9
Merge: 1cc8c1e8a bcc1a7180
Author: Nick Mathewson 
Date:   Wed Oct 31 11:01:41 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-10-30 Thread nickm
commit 1cc8c1e8a579e4fad4304d9538bab8d90a8ad32a
Merge: f4d7a7527 038bc21f8
Author: Nick Mathewson 
Date:   Tue Oct 30 09:34:04 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27741 |  5 +
 src/rust/protover/ffi.rs | 13 -
 2 files changed, 9 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-29 Thread nickm
commit f4d7a7527f63355365289fc68382f0a32f027094
Merge: 5fde2c254 8013e3e8b
Author: Nick Mathewson 
Date:   Mon Oct 29 15:57:30 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug28202 | 4 
 src/or/parsecommon.c | 3 +--
 src/or/routerparse.c | 7 +++
 3 files changed, 8 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-23 Thread nickm
commit 5fde2c2544ae7315939e56a47e2af2d44cce3922
Merge: 8a0728789 b2c52f5d6
Author: Nick Mathewson 
Date:   Tue Oct 23 19:54:16 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/rust/protover/ffi.rs | 1 -
 1 file changed, 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-23 Thread nickm
commit 8a0728789b1943ba39f41c1f09fe5da50838464c
Merge: cf1906542 169bc670d
Author: Nick Mathewson 
Date:   Tue Oct 23 19:18:23 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27740 |  4 
 changes/bug27804 |  3 +++
 src/rust/protover/ffi.rs | 10 --
 src/test/test_protover.c |  1 +
 4 files changed, 12 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-18 Thread nickm
commit cf19065425344411ef18dee2d95caa12dcdb9687
Merge: ec638e236 93fd924bd
Author: Nick Mathewson 
Date:   Thu Oct 18 09:12:57 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27800 |  4 
 src/or/nodelist.c| 37 +
 src/test/test_nodelist.c | 36 
 3 files changed, 65 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-15 Thread nickm
commit ec638e2368fb4dbd2a9a593e45a5cbcb756f4c07
Merge: e7827a2b7 6b2ef2c55
Author: Nick Mathewson 
Date:   Mon Oct 15 12:52:54 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/or/hs_intropoint.c | 3 +--
 1 file changed, 1 insertion(+), 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-15 Thread nickm
commit e7827a2b7355b53eebbd0273a21b82a4a0090ac8
Merge: d7e0dc005 86e0be421
Author: Nick Mathewson 
Date:   Mon Oct 15 12:47:46 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-10-15 Thread nickm
commit d7e0dc0056e5a82e298eb404f81c516f46657456
Merge: 49da1e9f6 796e36e53
Author: Nick Mathewson 
Date:   Mon Oct 15 10:48:35 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/common/util_bug.h | 7 ++-
 src/or/hs_common.c| 7 +++
 2 files changed, 9 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-15 Thread nickm
commit 49da1e9f6ac8da2850ef2d2024539a5001bd9dc7
Merge: 8f872e945 dff7d3d00
Author: Nick Mathewson 
Date:   Mon Oct 15 10:37:52 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-10-10 Thread nickm
commit 8f872e9459411e558719ef91edf8c2fe02344c43
Merge: 8464f4433 f7e93cf2e
Author: Nick Mathewson 
Date:   Wed Oct 10 17:12:34 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 .travis.yml | 51 ++-
 changes/ticket27738 |  4 
 2 files changed, 34 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-10-10 Thread nickm
commit 8464f4433862ec75c3d187721bad22a489dd0fe5
Merge: 396b94911 b057623be
Author: Nick Mathewson 
Date:   Wed Oct 10 11:34:48 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-21 Thread nickm
commit 396b9491119e4838388ac0aee8e20d87c0b74125
Merge: f466548e0 2cadd93ce
Author: Nick Mathewson 
Date:   Fri Sep 21 09:35:54 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27316 |  3 +++
 src/or/protover.c| 17 -
 src/test/test_protover.c |  4 
 3 files changed, 23 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-09-18 Thread nickm
commit f466548e0357c5624ced8ea2516cd7809060285d
Merge: d7ce4a9d7 75b95e1c8
Author: Nick Mathewson 
Date:   Tue Sep 18 08:31:14 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27206|  4 +++
 src/rust/protover/protoset.rs   | 49 +++--
 src/rust/protover/protover.rs   |  4 +--
 src/rust/protover/tests/protover.rs |  8 +++---
 4 files changed, 45 insertions(+), 20 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-09-14 Thread nickm
commit d7ce4a9d7daa6dfc4ca9bb075554f293d6efa2c0
Merge: e80db7943 a546e0760
Author: Nick Mathewson 
Date:   Fri Sep 14 12:56:30 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27335| 4 
 src/or/hs_service.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

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


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

2018-09-14 Thread nickm
commit e80db7943ecdc3c4f8ed5ebbec71de81d5b54fff
Merge: a2823f106 281854bab
Author: Nick Mathewson 
Date:   Fri Sep 14 10:48:01 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27708 | 4 
 src/or/config.c  | 1 +
 2 files changed, 5 insertions(+)

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


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

2018-09-14 Thread nickm
commit a2823f106bde9c4667bc1ca8946e74c1cd81b5c6
Merge: 7597340b3 7c26f88fd
Author: Nick Mathewson 
Date:   Fri Sep 14 09:25:34 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27687  |  4 
 src/rust/protover/errors.rs   |  3 +++
 src/rust/protover/protover.rs | 34 +-
 3 files changed, 40 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-09-13 Thread nickm
commit 7597340b32dd94f2109cddde63018bf5eb5bee2d
Merge: dc087f362 825342825
Author: Nick Mathewson 
Date:   Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-12 Thread nickm
commit dc087f3627d688134760606a8553319902827723
Merge: 1239fcfc3 4fa46fca8
Author: Nick Mathewson 
Date:   Wed Sep 12 17:24:41 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27649|  4 
 src/rust/protover/protoset.rs   | 17 -
 src/rust/protover/protover.rs   |  4 ++--
 src/rust/protover/tests/protover.rs | 14 +++---
 src/test/test_protover.c| 22 +++---
 5 files changed, 32 insertions(+), 29 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-09-11 Thread nickm
commit 1239fcfc37aaf6b732e0733ad747a7b3e56534c4
Merge: 95f06d61d ae1aea4cc
Author: Nick Mathewson 
Date:   Tue Sep 11 15:53:06 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25505| 3 +++
 src/or/channelpadding.c | 9 +++--
 2 files changed, 10 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-09-11 Thread nickm
commit 95f06d61d09b81039ee44ec7329e9d37fdc75ba0
Merge: 7df92c0e0 1d8957129
Author: Nick Mathewson 
Date:   Tue Sep 11 13:09:21 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 .travis.yml | 23 +++
 changes/ticket27252 |  6 ++
 changes/ticket27252-032 |  5 +
 3 files changed, 30 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-09-11 Thread nickm
commit 7df92c0e0cafd60088a5a3dc8d2e361e318f8e32
Merge: c6b8f7843 8afc100cb
Author: Nick Mathewson 
Date:   Tue Sep 11 12:04:56 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-10 Thread nickm
commit c6b8f7843a2dc5434bd105749d6a8d679913b4c9
Merge: 2e94df92c 05f5f6500
Author: Nick Mathewson 
Date:   Mon Sep 10 09:42:57 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-07 Thread nickm
commit e14da02ed09dafef289a3494ba1f58b7b7580b5f
Merge: 281045126 cff7cb858
Author: Nick Mathewson 
Date:   Fri Sep 7 15:13:59 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-07 Thread nickm
commit 2810451265e4650a31bbfa345ae96c0e959b990f
Merge: 1e50b0e88 732ea9120
Author: Nick Mathewson 
Date:   Fri Sep 7 09:15:56 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-07 Thread nickm
commit 1e50b0e8844937515922f9a4f52b8feea574c206
Merge: 1a3f9f377 056003d60
Author: Nick Mathewson 
Date:   Fri Sep 7 08:46:45 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-07 Thread nickm
commit 1a3f9f377ca616ec408fdcd9e64b9f75e4a46fb6
Merge: 340607639 df18cf0e8
Author: Nick Mathewson 
Date:   Fri Sep 7 08:44:40 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-07 Thread nickm
commit 340607639c23452e6b3b401c3fb4b08db6240413
Merge: 7aebf292d 08d5fd39d
Author: Nick Mathewson 
Date:   Fri Sep 7 08:42:19 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-05 Thread nickm
commit 7aebf292d61c8af30c9460fbe2bb743d776f6db2
Merge: 39792f430 a7e72f0c4
Author: Nick Mathewson 
Date:   Wed Sep 5 10:15:45 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-09-05 Thread nickm
commit 39792f430a90849202039f8fc8fa0bc9dc7a18b6
Merge: 6b3b59ad7 67bdd144b
Author: Nick Mathewson 
Date:   Wed Sep 5 09:56:19 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-29 Thread nickm
commit 6b3b59ad7cc4596f57fa73e1a0355f6e937bd516
Merge: 71f84c93b a28c14aad
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-27 Thread nickm
commit 71f84c93b059ca440ae7e428cb8c34b25c1d2a77
Merge: 583ef6042 64c3c6a79
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27345| 5 +
 src/test/include.am | 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-24 Thread nickm
commit 583ef6042cc57b65c93417afb45d678e9ea0f66e
Merge: d0dadf4d1 33e4e30d0
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-23 Thread nickm
commit d0dadf4d17540edd33da9617366cd6f3c7568c69
Merge: cbd71f5c9 e01ea64f0
Author: Nick Mathewson 
Date:   Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-22 Thread nickm
commit cbd71f5c910bd4e4d27b94be105e2f8d3e126896
Merge: 16dec180e 8691046ac
Author: Nick Mathewson 
Date:   Wed Aug 22 09:37:31 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-21 Thread nickm
commit 16dec180e704a67eee93841e47e68cf55464351f
Merge: 60d6a2ca6 3cfceeb45
Author: Nick Mathewson 
Date:   Tue Aug 21 20:04:17 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 .travis.yml  | 262 +--
 changes/bug26497 |   3 +
 changes/bug26497-backport|   3 +
 changes/bug26497-cd  |   4 +
 changes/bug27088 |   5 +
 changes/bug27090 |   3 +
 changes/bug27093 |   3 +
 changes/ticket24629  |   3 +
 changes/ticket24629-backport |   3 +
 changes/ticket26560  |   3 +
 changes/ticket26952-cargo|   3 +
 changes/ticket26952-ccache   |   3 +
 changes/ticket27087  |   3 +
 src/rust/tor_rust/include.am |   2 -
 src/test/test_rust.sh|   6 +-
 15 files changed, 191 insertions(+), 118 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-21 Thread nickm
commit 60d6a2ca688b5d353e8eee792305215528118bbe
Merge: d32ffe580 245025a3d
Author: Nick Mathewson 
Date:   Tue Aug 21 19:16:40 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-21 Thread nickm
commit d32ffe58001bd7219ae43e52989cb2db093cd169
Merge: 4f2ef558e 4c0c4d4ad
Author: Nick Mathewson 
Date:   Tue Aug 21 10:01:41 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26873 | 4 
 1 file 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-17 Thread nickm
commit 4f2ef558e726ddad988430c666831793cbcbe544
Merge: 5c1ea692e 87aacbfbb
Author: Nick Mathewson 
Date:   Fri Aug 17 09:38:26 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27177  |  4 
 src/rust/protover/protoset.rs | 15 ++-
 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-17 Thread nickm
commit 5c1ea692e6f371696489f75d7d363596adb7985d
Merge: 908f1b8eb cc93f175e
Author: Nick Mathewson 
Date:   Fri Aug 17 09:29:46 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27164  |  4 
 src/rust/protover/protoset.rs | 14 +-
 2 files changed, 17 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-16 Thread nickm
commit 908f1b8eb29f25758d4b3b0ff263e2d71725ce2d
Merge: cd2ddf2e4 936e2aa0d
Author: Nick Mathewson 
Date:   Thu Aug 16 08:37:11 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-16 Thread nickm
commit cd2ddf2e4e2c92c2421335cbf7917b61464cfb89
Merge: c80afbacd 4847e2216
Author: Nick Mathewson 
Date:   Thu Aug 16 08:35:31 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 doc/HACKING/GettingStartedRust.md | 8 +---
 1 file changed, 5 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-15 Thread nickm
commit c80afbacd6b36ef6cd82d9a5a14f7c6358e65acd
Merge: ef4d5d99f 0fc171a47
Author: Nick Mathewson 
Date:   Wed Aug 15 12:20:57 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-15 Thread nickm
commit ef4d5d99fb53a313e94b4bf34a4d0ae2f7ba0fef
Merge: b2fa807b9 1868982de
Author: Nick Mathewson 
Date:   Wed Aug 15 02:18:54 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26779|  4 
 configure.ac| 20 
 src/common/compat_threads.c |  5 ++---
 src/common/compat_threads.h | 19 +++
 4 files changed, 37 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-09 Thread nickm
commit b2fa807b99241198911d004097668dc997dfa94d
Merge: bf3a6643e fde551a38
Author: Nick Mathewson 
Date:   Thu Aug 9 08:47:25 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-08 Thread nickm
commit bf3a6643e1a14a4b0d2f65faf7c7ae4b5d11a5c3
Merge: 4012daacd c4d0d9bd2
Author: Nick Mathewson 
Date:   Wed Aug 8 18:06:15 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26948 | 4 
 src/or/main.c| 9 +
 2 files changed, 9 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-08 Thread nickm
commit 4012daacd12f8c3ab29250d6a004ede6b360faec
Merge: 401052548 00536254b
Author: Nick Mathewson 
Date:   Wed Aug 8 09:26:23 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-03 Thread nickm
commit 40105254840e4f460c193f262125d7ba454209a2
Merge: 4902cccab 2a6c1585b
Author: Nick Mathewson 
Date:   Fri Aug 3 07:33:45 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-08-01 Thread nickm
commit 4902cccab4339e2e69cde360207965bc3c5f5e7a
Merge: 51bc8283a eb604f5fa
Author: Nick Mathewson 
Date:   Wed Aug 1 14:37:07 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/test/test_config.c | 31 ++-
 1 file changed, 18 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-31 Thread nickm
commit 51bc8283a0a7d830f59ae73e0db589c933c1fecd
Merge: 524f0cd36 373b23a9e
Author: Nick Mathewson 
Date:   Tue Jul 31 08:30:01 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26876 |  4 
 configure.ac | 32 +---
 2 files changed, 33 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-30 Thread nickm
commit 524f0cd367f93edca8c5dbf474f63069149640dc
Merge: 1a646880d 4f854dbdc
Author: Nick Mathewson 
Date:   Mon Jul 30 09:01:59 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26627  |  7 +++
 src/or/hs_circuit.c   | 20 ++--
 src/or/hs_service.c   | 29 -
 src/or/hs_service.h   |  5 +++--
 src/test/test_hs_cell.c   |  4 ++--
 src/test/test_hs_intropoint.c |  4 ++--
 src/test/test_hs_service.c|  2 +-
 7 files changed, 49 insertions(+), 22 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-30 Thread nickm
commit 1a646880d1115c352ae12ce4cfae41690f7e834f
Merge: 6716cd090 a159eaf45
Author: Nick Mathewson 
Date:   Mon Jul 30 08:45:01 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26924   |  4 
 changes/bug26927   |  4 
 src/or/connection_or.c | 14 +-
 3 files changed, 17 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-30 Thread nickm
commit 6716cd090a7dad38edfec54b159d66941329356e
Merge: 2b12e2679 15d7f24c5
Author: Nick Mathewson 
Date:   Mon Jul 30 08:17:25 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26785   | 4 
 configure.ac   | 3 +++
 src/common/compress_zstd.c | 4 
 3 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-20 Thread nickm
commit 2b12e2679115975ff4a7114e062285865cb1c669
Merge: 852155bb6 dbf57ecf3
Author: Nick Mathewson 
Date:   Fri Jul 20 10:42:29 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket26647 | 4 
 src/or/control.c| 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-19 Thread nickm
commit 852155bb62df0d30811147c3506d19bf80647eda
Merge: 24ac72877 0a60a94a5
Author: Nick Mathewson 
Date:   Thu Jul 19 08:31:07 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26853| 3 +++
 src/test/test_key_expiration.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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-18 Thread nickm
commit 0c725e9377e2cebd40d1fb3dbde0472c55fc98a5
Merge: 783fbe47d 9e247ac27
Author: Nick Mathewson 
Date:   Wed Jul 18 16:39:10 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-18 Thread nickm
commit 24ac72877de79a529cb42381a6d70b1967e2030b
Merge: 0c725e937 e0f99404f
Author: Nick Mathewson 
Date:   Wed Jul 18 16:39:25 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-18 Thread nickm
commit 783fbe47dd774008f24d263f43c22fd3d68efa4f
Merge: 1440c4598 c31700d66
Author: Nick Mathewson 
Date:   Wed Jul 18 15:04:27 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-17 Thread nickm
commit 1440c4598ce1ba26d80d6f078ba5a76bca7677fa
Merge: 9e6f21c74 28d1057d5
Author: Nick Mathewson 
Date:   Tue Jul 17 14:56:52 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-12 Thread nickm
commit dbfe8a42a4631795d4cea8d6020cb619d790cc62
Merge: 81b5483ee 710188f84
Author: Nick Mathewson 
Date:   Thu Jul 12 14:32:16 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-09 Thread nickm
commit 81b5483ee6167f8ea176ca33fa9c8deed684fb32
Merge: 99f9816ef f5e3bcb60
Author: Nick Mathewson 
Date:   Mon Jul 9 15:18:09 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-09 Thread nickm
commit 059f638a121031386a380b1ea416b65142e9aafb
Merge: 4e4d2ed86 250e0fc1c
Author: Nick Mathewson 
Date:   Mon Jul 9 10:17:20 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/test/test_entrynodes.c | 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-09 Thread nickm
commit 4e4d2ed864bee5c019156024f0047d3c45a53fcd
Merge: 2f3b9151e 69918629f
Author: Nick Mathewson 
Date:   Mon Jul 9 10:14:43 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-09 Thread nickm
commit 2f3b9151ec55fbfe7467b7e0a5ee3fccd769c0e3
Merge: 92b3fc931 532873a92
Author: Nick Mathewson 
Date:   Mon Jul 9 09:24:48 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-09 Thread nickm
commit 92b3fc9317c183d1566bc2361e11bafe96d003cd
Merge: 04ce541f8 a95cfb8a5
Author: Nick Mathewson 
Date:   Mon Jul 9 09:22:13 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25512 | 5 +
 src/or/control.c | 9 -
 2 files changed, 13 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-09 Thread nickm
commit 04ce541f8894122cf8eea18ff9fa54a50e22d453
Merge: adbe261f2 f721a0822
Author: Nick Mathewson 
Date:   Mon Jul 9 09:14:03 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/test/test_rust.sh | 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-09 Thread nickm
commit adbe261f22df6bc602ced21371f0e9be0d090543
Merge: 0b8760a88 451a84cec
Author: Nick Mathewson 
Date:   Mon Jul 9 09:11:41 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-07-09 Thread nickm
commit 0b8760a8804feb5f51143dad12d50860c3e6a5bd
Merge: b489e8cfe fead22fb2
Author: Nick Mathewson 
Date:   Mon Jul 9 09:09:01 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25705|  5 +
 src/or/circuituse.c | 45 ++---
 2 files changed, 39 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-03 Thread nickm
commit b489e8cfeaaf4d66f048e51453873a0357dd2ba3
Merge: b22b60365 4c094436c
Author: Nick Mathewson 
Date:   Tue Jul 3 09:48:03 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26535.029| 5 +
 changes/bug26535.032| 5 +
 src/test/hs_ntor_ref.py | 7 +--
 src/test/ntor_ref.py| 9 ++---
 4 files changed, 21 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-07-01 Thread nickm
commit b22b60365f2d7db2db31128fa733c67d6f52fb8c
Merge: 103076a75 9aeef05f8
Author: Nick Mathewson 
Date:   Sun Jul 1 10:22:20 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26523 |  5 +
 src/or/control.c | 13 +
 2 files changed, 14 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-29 Thread nickm
commit 103076a75933dd6410e5742fa268f36b0d021e13
Merge: a814ed019 72ee0b6f7
Author: Nick Mathewson 
Date:   Fri Jun 29 23:12:03 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 scripts/maint/checkSpace.pl | 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-29 Thread nickm
commit a814ed0192d9f11182c996d5833ea5543e6326b3
Merge: 739cd6ec2 36c372581
Author: Nick Mathewson 
Date:   Fri Jun 29 13:49:43 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/test/test_channelpadding.c | 1 +
 src/test/test_hs_descriptor.c  | 3 +++
 src/test/test_shared_random.c  | 1 +
 3 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-29 Thread nickm
commit 739cd6ec209742390b612ad881ed0e22e8d5e96b
Merge: 97dfe87be 92b4996b2
Author: Nick Mathewson 
Date:   Fri Jun 29 13:07:13 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 src/or/hs_client.c| 6 +++---
 src/test/test_hs_common.c | 7 ++-
 src/test/test_hs_intropoint.c | 7 +++
 3 files changed, 16 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-29 Thread nickm
commit 97dfe87be0b2e0aa3fd8db3926d9b66ec2373a01
Merge: 0f85e059b f82f8179e
Author: Nick Mathewson 
Date:   Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket26467|  3 +++
 src/or/directory.c |  1 +
 src/or/hs_descriptor.c |  1 +
 src/test/hs_test_helpers.c |  6 ++
 src/test/test_channelpadding.c |  2 ++
 src/test/test_hs_descriptor.c  | 11 +--
 6 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-29 Thread nickm
commit 0f85e059b7e90cdfdb9b130b811e552107fdee38
Merge: 63cddead3 df896ed63
Author: Nick Mathewson 
Date:   Fri Jun 29 13:00:56 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-06-26 Thread nickm
commit 63cddead384d067604f44091e2a8a3f776ccd2bf
Merge: 6c38795b7 f8dad5a07
Author: Nick Mathewson 
Date:   Tue Jun 26 09:21:59 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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

2018-06-21 Thread nickm
commit 6c38795b7ef0dbe88f188b60e65d6b850946374c
Merge: 156e9723b 8b108935b
Author: Nick Mathewson 
Date:   Thu Jun 21 08:54:02 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26435 | 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.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-21 Thread nickm
commit 156e9723bfda28b9cddbc081e80adc75a4c3423e
Merge: 8a6e2d5da 7b1a3c516
Author: Nick Mathewson 
Date:   Thu Jun 21 08:36:48 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26435  | 5 +
 src/or/protover.c | 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-17 Thread nickm
commit 8a6e2d5da529564fe61e2841be1b497b0432ca1f
Merge: c134ccfac a360bf287
Author: Nick Mathewson 
Date:   Sun Jun 17 19:24:48 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 .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


  1   2   >