[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 3c97b148a42f6863ccf4b950967ce345d2fc8cbe Merge: ed84dab8b 2968c716d Author: Nick Mathewson Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit ed84dab8b4cd691dcdc0fecfb9c451bb0ffd930a
Merge: 6e9d5fc4e a3ec89a4f
Author: Nick Mathewson
Date: Fri Jun 29 13:49:43 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
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(+)
diff --cc src/test/test_hs_descriptor.c
index a5e9b9667,a40616c61..897b44188
--- a/src/test/test_hs_descriptor.c
+++ b/src/test/test_hs_descriptor.c
@@@ -196,18 -195,19 +196,19 @@@ test_link_specifier(void *arg
/* Decode it and validate the format. */
ret = base64_decode(buf, sizeof(buf), b64, strlen(b64));
-tt_int_op(ret, >, 0);
+tt_int_op(ret, OP_GT, 0);
/* First byte is the number of link specifier. */
-tt_int_op(get_uint8(buf), ==, 1);
+tt_int_op(get_uint8(buf), OP_EQ, 1);
ret = link_specifier_parse(&ls, (uint8_t *) buf + 1, ret - 1);
-tt_int_op(ret, ==, 8);
+tt_int_op(ret, OP_EQ, 8);
/* Should be 2 bytes for port and 4 bytes for IPv4. */
-tt_int_op(link_specifier_get_ls_len(ls), ==, 6);
+tt_int_op(link_specifier_get_ls_len(ls), OP_EQ, 6);
ipv4 = link_specifier_get_un_ipv4_addr(ls);
-tt_int_op(tor_addr_to_ipv4h(&spec.u.ap.addr), ==, ipv4);
-tt_int_op(link_specifier_get_un_ipv4_port(ls), ==, spec.u.ap.port);
+tt_int_op(tor_addr_to_ipv4h(&spec.u.ap.addr), OP_EQ, ipv4);
+tt_int_op(link_specifier_get_un_ipv4_port(ls), OP_EQ, spec.u.ap.port);
link_specifier_free(ls);
+ ls = NULL;
tor_free(b64);
}
@@@ -233,11 -233,11 +234,12 @@@
for (unsigned int i = 0; i < sizeof(ipv6); i++) {
ipv6[i] = link_specifier_get_un_ipv6_addr(ls, i);
}
-tt_mem_op(tor_addr_to_in6_addr8(&spec.u.ap.addr), ==, ipv6, sizeof(ipv6));
-tt_int_op(link_specifier_get_un_ipv6_port(ls), ==, spec.u.ap.port);
+tt_mem_op(tor_addr_to_in6_addr8(&spec.u.ap.addr), OP_EQ, ipv6,
+ sizeof(ipv6));
+tt_int_op(link_specifier_get_un_ipv6_port(ls), OP_EQ, spec.u.ap.port);
link_specifier_free(ls);
+ ls = NULL;
tor_free(b64);
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 68dfbd5ef433b830059baa08d48589518db05d22 Merge: fe2588a5a ea14d3408 Author: Nick Mathewson Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 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(-) diff --cc src/or/hs_descriptor.c index fef0607c1,8e10c0fff..582ac9cb7 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@@ -1115,16 -1133,8 +1115,17 @@@ decode_link_specifiers(const char *enco memcpy(hs_spec->u.legacy_id, link_specifier_getarray_un_legacy_id(ls), sizeof(hs_spec->u.legacy_id)); break; +case LS_ED25519_ID: + /* Both are known at compile time so let's make sure they are the same + * else we can copy memory out of bound. */ + tor_assert(link_specifier_getlen_un_ed25519_id(ls) == + sizeof(hs_spec->u.ed25519_id)); + memcpy(hs_spec->u.ed25519_id, + link_specifier_getconstarray_un_ed25519_id(ls), + sizeof(hs_spec->u.ed25519_id)); + break; default: + tor_free(hs_spec); goto err; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit fe2588a5a8560c8cb03345b3caaaf906655c34a1 Merge: 25226fb26 1385a5118 Author: Nick Mathewson Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 25226fb260a6b5f93187b707ec35f06637fbe710 Merge: 6107a2127 d6d3f8486 Author: Nick Mathewson Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 Merge: ff70cc84f 94f300762 Author: Nick Mathewson Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 7e7585d0a193f8ac368705d7028ec4b241fc2afe Merge: 6017447e3 9713ecfc4 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 53513e4bfed4c6713509f239cad94ca5b4995246 Merge: 5d8a927aa 16381b579 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 5d8a927aa35c01c59dcf137827db27b92d034498 Merge: 74ac463e7 d84581a3e Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 74ac463e7fb806e5abf48be788daf03c40e930ad Merge: dd63033fc 19f386852 Author: Nick Mathewson Date: Tue Jun 12 08:11:20 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit dd63033fcbb960ac563a8f417a7f65e62781d9a9 Merge: 3f3739c6e 1ef8023e0 Author: Nick Mathewson Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 3f3739c6e064fd5e1c2ac89bfd49fed7a622ac68 Merge: 8340f641c f48fb8a72 Author: Nick Mathewson Date: Thu May 24 09:40:06 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 8340f641c30f8e529b513732be2c931e128227e2 Merge: 4aa3d511b d3a972561 Author: Nick Mathewson Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 4aa3d511b25fe99579d7810418433eef46e417da Merge: 7ee67c47f 502d2c006 Author: Nick Mathewson Date: Tue May 15 09:32:44 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 7ee67c47fae2263e8c4f5599e0fbba6531738120 Merge: 15b8c860d 2d61a8351 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 15b8c860d3c8eac8f560569a90e90ba517e1c6ae Merge: e5acbbd16 ba7043921 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit e5acbbd16d29a5d3187bf2867c4ffa15451669bb Merge: 394f102ea aa08c1970 Author: Nick Mathewson Date: Thu May 10 08:02:10 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26062| 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc src/or/networkstatus.c index dd82f6681,fdaa469fa..3d99dd9ee --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -1654,9 -1685,7 +1654,8 @@@ any_client_port_set(const or_options_t return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || - options->DNSPort_set); + options->DNSPort_set || + options->HTTPTunnelPort_set); } /** ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit be5b4415c2dce243a6249e6ca14b65423c9b0746 Merge: 246765342 6361a250f Author: Nick Mathewson Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 246765342e681ae6f8c35709f9acd9a78d7048d2 Merge: 7c3f87eb4 993e314c6 Author: Nick Mathewson Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 7c3f87eb4b2c3c4ce3422b3561bee36f3c9956c1 Merge: 89a3fafd4 bb35405d2 Author: Nick Mathewson Date: Wed Apr 25 08:01:53 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 89a3fafd49c046c3cd1c9c34f7db4798272f9ffb Merge: 9187cdb1c 5cc3a0379 Author: Nick Mathewson Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9 Merge: 1438c6c71 e88863407 Author: Nick Mathewson Date: Tue Apr 24 08:49:24 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e Merge: f0230ee38 5c3639923 Author: Nick Mathewson Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit f0230ee38a5031d447758259245a5121ec7e4789 Merge: c5899d5cf ce8e7427b Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit c5899d5cf3a761f4049c1d6f05232731edcfeb57 Merge: d3ac47b41 5e0fbd700 Author: Nick Mathewson Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit d3ac47b4153fbe51ca63882ce63165abdf50901b Merge: 124e06e85 db6902c23 Author: Nick Mathewson Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-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(-) diff --cc src/or/include.am index abf62c2e8,7548ed094..4938ae8e7 --- a/src/or/include.am +++ b/src/or/include.am @@@ -156,7 -144,9 +156,8 @@@ endi ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc\ src/or/bridges.h\ - src/or/buffers.h\ src/or/channel.h\ src/or/channelpadding.h \ src/or/channeltls.h \ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit df519e5de87d027ba51742b2b50710c69b9db2be Merge: 9b10eb2d7 e813116d3 Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 9b10eb2d7abe703f544aca559d385fc7f269 Merge: 0b795ce6d 834eef245 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 5e7d505850607a16f6051a19ff60c39ff4c8393e Merge: b5a6c0399 5acfc3087 Author: Nick Mathewson Date: Tue Mar 27 18:24:37 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid earlier version of 25629 fix. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit b5a6c03998d42147135385f21bd7b85a02385e0f Merge: 66d312063 068d09274 Author: Nick Mathewson Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit bc0de600b2033c6fb109d70ff3cbd8b8dc2ad271 Merge: a0cc7e949 1aa0ae2cc Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit d60dc27555a2bed448617e0b82e61817c9cff895 Merge: 094294dbb 0e7f15fdb Author: Nick Mathewson Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit d81a5231eee22d2d73a54b87b9ee13d3896220bc Merge: 1ec386561 0aa794d30 Author: Nick Mathewson Date: Sat Mar 3 11:33:02 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit d01abb9346bcb7b240b5277551ea75e85dfc160c Merge: bcfb03495 d4a758e08 Author: Nick Mathewson Date: Thu Mar 1 16:07:59 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 5b0ae084008eac13d051026c013862b239212807 Merge: d01abb934 c527a8a9c Author: Nick Mathewson Date: Thu Mar 1 16:43:10 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit bcfb034957dbd5d891befcd99a9725a225903b4e Merge: bd71e0a0c ac1942ac5 Author: Nick Mathewson Date: Wed Feb 21 11:53:50 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit bd71e0a0c8ccf684c40201f08c456596eac60887
Merge: c67adddac 2bcd264a2
Author: Nick Mathewson
Date: Fri Feb 16 09:54:13 2018 -0500
Merge branch 'maint-0.3.1' into maint-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(-)
diff --cc src/common/address.c
index dbe129be5,e6b437e9d..c683e90aa
--- a/src/common/address.c
+++ b/src/common/address.c
@@@ -1193,11 -1194,11 +1196,11 @@@ tor_addr_hash(const tor_addr_t *addr
case AF_INET:
return siphash24g(&addr->addr.in_addr.s_addr, 4);
case AF_UNSPEC:
- return 0x4e4d5342;
+ return siphash24g(unspec_hash_input, sizeof(unspec_hash_input));
case AF_INET6:
return siphash24g(&addr->addr.in6_addr.s6_addr, 16);
- default:
/* LCOV_EXCL_START */
+ default:
tor_fragile_assert();
return 0;
/* LCOV_EXCL_STOP */
diff --cc src/common/include.am
index cd5eea340,d12895b10..715ec0264
--- a/src/common/include.am
+++ b/src/common/include.am
@@@ -80,8 -80,8 +80,9 @@@ src_common_libor_ctime_testing_a_CFLAG
LIBOR_A_SRC = \
src/common/address.c\
+ src/common/address_set.c\
src/common/backtrace.c \
+ src/common/buffers.c\
src/common/compat.c \
src/common/compat_threads.c \
src/common/compat_time.c\
@@@ -148,9 -147,8 +149,10 @@@ src_common_libor_event_testing_a_CFLAG
COMMONHEADERS = \
src/common/address.h\
+ src/common/address_set.h\
src/common/backtrace.h \
+ src/common/buffers.h\
+ src/common/buffers_tls.h\
src/common/aes.h\
src/common/ciphers.inc \
src/common/compat.h \
diff --cc src/or/connection.c
index d2cf4fb41,fc0646b88..ed8de05d7
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@@ -704,7 -696,14 +705,14 @@@ connection_free,(connection_t *conn)
connection_ap_warn_and_unmark_if_pending_circ(TO_ENTRY_CONN(conn),
"connection_free");
}
-#endif
+#endif /* 1 */
+
+ /* Notify the circuit creation DoS mitigation subsystem that an OR client
+* connection has been closed. And only do that if we track it. */
+ if (conn->type == CONN_TYPE_OR) {
+ dos_close_client_conn(TO_OR_CONN(conn));
+ }
+
connection_unregister_events(conn);
connection_free_(conn);
}
diff --cc src/or/geoip.h
index acf61b97a,773525ccf..753bdbf82
--- a/src/or/geoip.h
+++ b/src/or/geoip.h
@@@ -19,7 -20,30 +20,30 @@@ STATIC int geoip_parse_entry(const cha
STATIC int geoip_get_country_by_ipv4(uint32_t ipaddr);
STATIC int geoip_get_country_by_ipv6(const struct in6_addr *addr);
STATIC void clear_geoip_db(void);
-#endif
+#endif /* defined(GEOIP_PRIVATE) */
+
+ /** Entry in a map from IP address to the last time we've seen an incoming
+ * connection from that IP address. Used by bridges only to track which
+ * countries have them blocked, or the DoS mitigation subsystem if enabled. */
+ typedef struct clientmap_entry_t {
+ HT_ENTRY(clientmap_entry_t) node;
+ tor_addr_t addr;
+ /* Name of pluggable transport used by this client. NULL if no
+ pluggable transport was used. */
+ char *transport_name;
+
+ /*
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit c8b087d90109d740e57d0347cb3df8d1be336337 Merge: cb9a322b6 3930ffdf6 Author: Nick Mathewson Date: Fri Feb 16 08:47:41 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit cb9a322b675d0aa1178ab92af13b9ec92008c8d4 Merge: b062730a1 f647035b3 Author: Nick Mathewson Date: Tue Feb 13 16:55:19 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit b062730a11a78f9cb11e4b0af20a66997280c0f9 Merge: 021c3bd58 17a923941 Author: Nick Mathewson Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 021c3bd5879f1f3d25823a63c86b159dfb29a434 Merge: 98fc8cd93 91109bc81 Author: Nick Mathewson Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 98fc8cd937a61becb96c848d7719012a9ce959ef Merge: 67043d957 b2c4d4e7f Author: Nick Mathewson Date: Sun Feb 11 18:11:04 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 67043d957f2f3cc107c5e0cb3f5c2caa35639506 Merge: 684d57fe8 8939eaf47 Author: Nick Mathewson Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 684d57fe8a21ee74b7b66f0035674ccbe0c1f921
Merge: 4de20d175 eccef6ba6
Author: Nick Mathewson
Date: Sun Feb 11 17:00:52 2018 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug21074_downgrade | 4
src/common/compat.c| 14 +++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --cc src/common/compat.c
index 7fe97488e,4a1f0013c..83bb707e1
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@@ -1753,14 -1752,13 +1754,13 @@@ set_max_file_descriptors(rlim_t limit,
(unsigned long)try_limit, (unsigned long)OPEN_MAX,
(unsigned long)rlim.rlim_max);
}
- bad = 0;
+ couldnt_set = 0;
}
}
-#endif /* OPEN_MAX */
+#endif /* defined(OPEN_MAX) */
- if (bad) {
+ if (couldnt_set) {
log_warn(LD_CONFIG,"Couldn't set maximum number of file descriptors:
%s",
-strerror(errno));
- return -1;
+strerror(setrlimit_errno));
}
}
/* leave some overhead for logs, etc, */
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 4de20d175476ab684ca15ea794af729348297540 Merge: 84bc75b2e 86583ad78 Author: Nick Mathewson Date: Sat Feb 10 16:09:01 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 84bc75b2e7046eed519e09cba77b3a1727fa64f5 Merge: 4ceae7c6b 04a8e81fa Author: Nick Mathewson Date: Thu Feb 8 10:29:06 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 31542cc306ea6d7f4ca629fccd9bcd536573f6d8 Merge: 61cb2993d 9cbc40e37 Author: Nick Mathewson Date: Thu Feb 1 15:28:17 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 9bfb6fe3958240172f1133e918d1fc6bd5732532 Merge: cb90defba 5fc0437e7 Author: Nick Mathewson Date: Wed Jan 31 10:06:49 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit cb90defba6f16ac96578a6b88c2c3d384a7748ee Merge: e81896add 86e6cb640 Author: Nick Mathewson Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit e81896adda197b705958bcbe2b9d2c5db839b8a5 Merge: ee5c624be 9c2bc441f Author: Nick Mathewson Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 129456e22257d24c380bed0f9ebc9d68955a01df Merge: de3cf40fa 7f2e23e7a Author: Nick Mathewson Date: Fri Jan 19 16:30:50 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit e2aacf100f5112aa8d0564b9f90ce38048ee0a82 Merge: 44388757c 483a59ec2 Author: Nick Mathewson Date: Fri Jan 19 10:18:29 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 44388757c44834d63614c4e13cf88931992afc2a Merge: 4e653ac2c f406b9df0 Author: Nick Mathewson Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 4e653ac2cab08edf0e811ae38204e61bc13f1871 Merge: f02c6bcad af8cadf3a Author: Nick Mathewson Date: Wed Jan 17 11:12:15 2018 -0500 Merge branch 'maint-0.3.1' into maint-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(-) diff --cc src/rust/Cargo.lock index 4ac9606ce,4ac9606ce..e208e1432 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@@ -1,14 -1,14 +1,14 @@@ --[root] ++[[package]] ++name = "libc" ++version = "0.2.22" ++source = "registry+https://github.com/rust-lang/crates.io-index"; ++ ++[[package]] name = "tor_util" version = "0.0.1" dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", ] --[[package]] --name = "libc" --version = "0.2.22" --source = "registry+https://github.com/rust-lang/crates.io-index"; -- [metadata] "checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 1c5c5f0e50084c7a36991212ddf21295306da17f Merge: 748ad2124 e3ab27001 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 748ad2124db0b19861300d984a350519cc0a8bb1 Merge: 5f2c7a856 a1ce1ab20 Author: Nick Mathewson Date: Mon Jan 8 09:35:55 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 3618bd6166002c7aadbb832d8a3e8bdba193f00c Merge: 9ef97a268 48d94e290 Author: Nick Mathewson Date: Fri Jan 5 16:41:34 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket24681 | 6 ++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 - 3 files changed, 16 insertions(+), 2 deletions(-) diff --cc doc/tor.1.txt index fc285ebe1,c4c569836..a319aa938 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -466,11 -450,12 +466,12 @@@ GENERAL OPTION When configured to use both directory authorities and fallback directories, the directory authorities also work as fallbacks. They are chosen with their regular weights, multiplied by this number, which - should be 1.0 or less. (Default: 1.0) + should be 1.0 or less. The default is less than 1, to reduce load on + authorities. (Default: 0.1) -[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + +[[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] __ipv4address__:__port__ __fingerprint__ + -[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__:: +[[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] [**flags**] __ipv4address__:__port__ __ fingerprint__:: These options behave as DirAuthority, but they replace fewer of the default directory authorities. Using AlternateDirAuthority replaces the default Tor directory authorities, but ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 451c852a0f75fe9ac6935851e763a948c1c5b197 Merge: 2aa1767b2 c1d98c75e Author: Nick Mathewson Date: Wed Jan 3 09:00:00 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 707076002d4db2b8b2e6f05bea86316674bf9f45 Merge: 94c59851d fb5877b97 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 84adb9fcca3d4e1954c1dd215a3e765c689d82b3 Merge: c38157be9 08469a338 Author: Nick Mathewson Date: Thu Dec 21 10:50:33 2017 -0500 Merge branch 'maint-0.3.1' into maint-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(-) diff --cc src/or/relay.h index 2412dcb23,9dc0b5d3a..4cc1a0fbd --- a/src/or/relay.h +++ b/src/or/relay.h @@@ -102,9 -109,10 +109,10 @@@ STATIC int connection_edge_process_reso const relay_header_t *rh); STATIC packed_cell_t *packed_cell_new(void); STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue); + STATIC destroy_cell_t *destroy_cell_queue_pop(destroy_cell_queue_t *queue); STATIC size_t cell_queues_get_total_allocation(void); STATIC int cell_queues_check_size(void); -#endif +#endif /* defined(RELAY_PRIVATE) */ -#endif +#endif /* !defined(TOR_RELAY_H) */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 7e45720cf4c88bff92a6de23ccbdd96d4cab2be5 Merge: 565ec6100 5e9264671 Author: Nick Mathewson Date: Wed Dec 20 12:15:24 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 4593f5a6e12132be4ac97d7a93675d1a04fa4b29 Merge: 43fb8fc5c cdee62da9 Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 4c54021baf4d22debc0381ae07edd911252dcd85 Merge: 4593f5a6e 31ce03a2b Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 43fb8fc5cba65edbd882729580e0d67857ecf7fe Merge: e553bf3ce 04524443d Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit e553bf3ce4b68a752f5f75c9f2e78cfc45c68f2a Merge: bfc9be4c7 736e7299c Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit bfc9be4c777bb2349e7c3ec6763896620e285f7e Merge: dc79d5299 f7b41bcdf Author: Nick Mathewson Date: Mon Dec 11 16:50:48 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit dc79d5299d1ffebab06d2e5ea9ef5f9459e0fc9a Merge: acc462c96 d2031f2c6 Author: Nick Mathewson Date: Mon Dec 11 16:46:00 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit acc462c965acb90c2631797e10bb630eb2789e4e Merge: 418d8bbe9 ae608408e Author: Nick Mathewson Date: Mon Dec 11 16:43:48 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23682 | 5 + 1 file 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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit b86c9acac360c23749f007c29f1bdd7b8347c18d Merge: 909c91049 5c03bb7c0 Author: Nick Mathewson Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 909c91049a424776c563363312f93dcdc4cdb241 Merge: 998a24712 7fae562a4 Author: Nick Mathewson Date: Fri Dec 1 09:35:31 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 9c89e8e4354283e4596e82adb876653d4c95ac6c Merge: fd73a168c 4ebd43654 Author: Nick Mathewson Date: Thu Nov 30 12:25:53 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" to avoid version bumps ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit fd73a168ca5bf8ea6a0fa01878dd16d356d14cfa
Merge: 25d50decb ee48eb1eb
Author: Nick Mathewson
Date: Thu Nov 30 12:07:59 2017 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24313 | 5 +
changes/trove-2017-009 | 10 ++
changes/trove-2017-010 | 6 ++
changes/trove-2017-011 | 8
changes/trove-2017-012-part1 | 6 ++
changes/trove-2017-012-part2 | 5 +
src/common/crypto.c | 16 +---
src/or/entrynodes.c | 3 ++-
src/or/protover.c| 5 +
src/or/rendservice.c | 8 +++-
src/or/routerlist.c | 5 -
11 files changed, 71 insertions(+), 6 deletions(-)
diff --cc src/or/routerlist.c
index 355f8e0fa,507580f19..af4f67dc1
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2825,21 -2810,17 +2825,24 @@@ router_choose_random_node(smartlist_t *
rule = weight_for_exit ? WEIGHT_FOR_EXIT :
(need_guard ? WEIGHT_FOR_GUARD : WEIGHT_FOR_MID);
- /* Exclude relays that allow single hop exit circuits. This is an obsolete
- * option since 0.2.9.2-alpha and done by default in 0.3.1.0-alpha. */
- SMARTLIST_FOREACH(nodelist_get_list(), node_t *, node,
+ SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), node_t *, node) {
if (node_allows_single_hop_exits(node)) {
+ /* Exclude relays that allow single hop exit circuits. This is an
+ * obsolete option since 0.2.9.2-alpha and done by default in
+ * 0.3.1.0-alpha. */
smartlist_add(excludednodes, node);
-});
+} else if (rendezvous_v3 &&
+ !node_supports_v3_rendezvous_point(node)) {
+ /* Exclude relays that do not support to rendezvous for a hidden service
+ * version 3. */
+ smartlist_add(excludednodes, node);
+}
+ } SMARTLIST_FOREACH_END(node);
- if ((r = routerlist_find_my_routerinfo()))
+ /* If the node_t is not found we won't be to exclude ourself but we
+* won't be able to pick ourself in router_choose_random_node() so
+* this is fine to at least try with our routerinfo_t object. */
+ if ((r = router_get_my_routerinfo()))
routerlist_add_node_and_family(excludednodes, r);
router_add_running_nodes_to_smartlist(sl, need_uptime, need_capacity,
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 25d50decb275854c312c8ee4ce5fd7e3f2945e5c Merge: f0007f2b8 500f04a74 Author: Nick Mathewson Date: Thu Nov 30 11:48:12 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 4bb287aa39d74e99dc319cd0a3fde88419340848 Merge: a7e777ab8 703ab95e9 Author: Nick Mathewson Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bastet_v6 | 4 src/or/config.c | 1 + 2 files changed, 5 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 65a6103afc39890f41f6f5e7ba7e4ef570af1622 Merge: d45bf0c65 735855952 Author: Nick Mathewson Date: Sat Nov 18 11:02:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 "Ours" merge to avoid taking ticket18329_minimal_025 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 6059784be0b022adbe274035acc920381ca3fef0 Merge: 985c41b50 1d5e693b6 Author: Nick Mathewson Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 05ae99566549b57e7003e5c243f199f3aaa1f857 Merge: d0b75b5ad 562b3c967 Author: Nick Mathewson Date: Mon Nov 13 12:57:58 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit d0b75b5ade6713373e97fdbd563b8ffaf14f237b
Merge: 3300a6e93 7df28ce29
Author: Nick Mathewson
Date: Mon Nov 13 12:27:36 2017 -0500
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/bug24262 | 3 +++
src/or/hs_common.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --cc src/or/hs_common.c
index f79aeb598,7cef5a8e2..a0f2af29c
--- a/src/or/hs_common.c
+++ b/src/or/hs_common.c
@@@ -213,18 -56,7 +213,18 @@@ hs_check_service_private_dir(const cha
STATIC uint64_t
get_time_period_length(void)
{
+ /* If we are on a test network, make the time period smaller than normal so
+ that we actually see it rotate. Specifically, make it the same length as
+ an SRV protocol run. */
+ if (get_options()->TestingTorNetwork) {
+unsigned run_duration = sr_state_get_protocol_run_duration();
+/* An SRV run should take more than a minute (it's 24 rounds) */
+tor_assert_nonfatal(run_duration > 60);
+/* Turn it from seconds to minutes before returning: */
+return sr_state_get_protocol_run_duration() / 60;
+ }
+
- int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval",
+ int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval",
HS_TIME_PERIOD_LENGTH_DEFAULT,
HS_TIME_PERIOD_LENGTH_MIN,
HS_TIME_PERIOD_LENGTH_MAX);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 6f9ab69b6dbaf99d7dedaa5714b2fc69e51120ca Merge: 7dddef2a7 91188540a Author: Nick Mathewson Date: Mon Nov 13 11:18:02 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 7dddef2a76ccfdb27293c7035b073e5c15135137 Merge: 441bfcd88 89b9951ec Author: Nick Mathewson Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 441bfcd8856ee98f4d622e4ebbfcabe24624ca66 Merge: 512dfa15e 2777b469f Author: Nick Mathewson Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 512dfa15edf9723cb5bfa2b86d5658e320496445 Merge: aa1d90b40 ef9251157 Author: Nick Mathewson Date: Sat Nov 11 12:23:34 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2017-11-06 |4 + src/config/geoip | 9406 -- src/config/geoip6| 848 - 3 files changed, 6426 insertions(+), 3832 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 7c59c751b05ff1195538d2d4bd8cb4ff8ea1885e Merge: 5bee5fbac 5a21b2708 Author: Nick Mathewson Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23693 | 6 ++ src/or/config.c | 1 + 2 files changed, 7 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 274de0e2bcffecea1c2d3bacefef13547a006974 Merge: e7126a103 7c2f688fb Author: Nick Mathewson Date: Wed Oct 25 09:28:57 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9 Merge: 0d4addfc7 38a58076e Author: Nick Mathewson Date: Tue Oct 24 09:10:37 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 122a7f8848785e3cefef812749c7ec1844b26402 Merge: cce1a6efa 990322fca Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit b1d6cf2508e57c98017412446024c9dd6587fe63 Merge: 8b8d50104 f0a6ea0bf Author: Nick Mathewson Date: Mon Oct 23 15:55:48 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 + 2 files changed, 8 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 8b8d501040946bb2280a9640f91a55b7f17b03e3 Merge: 6a7aa4735 af33fdd7c Author: Nick Mathewson Date: Mon Oct 23 09:22:43 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 6a7aa4735724cdf8d37e4109705338a1ea947449 Merge: 009141c6a 85115796b Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 009141c6a8b282b22bc9ee2fc0bf9fd9eb8ce867 Merge: b8dedaee7 23e3d57e1 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit b8dedaee743c7368664d63a77167b3ba82ff0b81 Merge: 578eead1c df57d1e0c Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit 578eead1c81572d5b7d9ab81a14963d9711bc0b6 Merge: bae96cf1d b68de63eb Author: Nick Mathewson Date: Mon Oct 23 08:53:25 2017 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit bae96cf1dcab085f26bde7bfe67bd4e69ba3f5fb Merge: a46288252 9120ac221 Author: Nick Mathewson Date: Mon Oct 23 08:47:59 2017 -0400 Merge branch 'maint-0.3.1' into maint-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/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
commit a46288252b28b81bb95dcf94fab53c8fb6e86ffc Merge: 929874908 5d37d2700 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
