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

commit 7f2e23e7acc0735e5ae933535a1b617a0860e528 Merge: 00a42277e b39c50cde Author: Nick Mathewson Date: Fri Jan 19 16:30:12 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid maint-0.3.0's version of 24895. _

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

commit 9b19e33bedcdd107d0599ab795cccfc2d7cb93dc Merge: f406b9df0 1cf11b694 Author: Nick Mathewson Date: Fri Jan 19 10:17:33 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid 0.2.5 version of #24863 fix. ___

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

commit e3ab27001f81dc05eb1dd1ac8371a35ccce2b50d Merge: a1ce1ab20 b85fa0bd5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968 ++

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

commit a1ce1ab201e4ca46cd3caa3fc3c9bd692d2de3b1 Merge: 48d94e290 8042c356f Author: Nick Mathewson Date: Mon Jan 8 09:34:57 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441 ++

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

commit 48d94e290dec5a5563d8ba97754b98f4374e9566 Merge: c1d98c75e 16fd975a8 Author: Nick Mathewson Date: Fri Jan 5 16:41:34 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket24681 | 6 ++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 - 3 files changed

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

commit c1d98c75e305eaf63e81903ca5a4eb68dcae515b Merge: fb5877b97 bbc9ff160 Author: Nick Mathewson Date: Wed Jan 3 08:59:59 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24633 | 5 + src/ext/timeouts/timeout-bitops.c | 4 ++-- 2 files changed, 7 ins

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

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7 Merge: 08469a338 8a7767603 Author: Nick Mathewson Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24736 | 6 ++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) __

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

commit 08469a338ab524e233f357d46504338fd64dedf9 Merge: 5e9264671 03b4dd92a Author: Nick Mathewson Date: Thu Dec 21 10:50:06 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24666 | 7 src/or/circuitmux.c| 34 ++-- src/or/circuitmux.

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

commit 5e92646715f32cae4d4d7f4f9a0f09108b8ddd73 Merge: 31ce03a2b 08ed0d793 Author: Nick Mathewson Date: Wed Dec 20 12:15:24 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2017-12-06 | 4 + src/config/geoip | 12380 +++--

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

commit 31ce03a2b976966f8c4045f4a3e936b02b25352e Merge: cdee62da9 d3b7a2bd2 Author: Nick Mathewson Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-) ___

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

commit cdee62da9e06dfc91a3100248bd9b8e82345347f Merge: 04524443d da38904ef Author: Nick Mathewson Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24167| 7 +++ src/or/connection.c | 4 2 files changed, 11 insertions(+) _

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

commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23856 | 4 src/or/rephist.c| 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 ins

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

commit 736e7299ce04bd96aa75c50f7dd7ecba36945917 Merge: f7b41bcdf 7fcb222ab Author: Nick Mathewson Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23985| 9 + src/or/routerlist.c | 5 + 2 files changed, 14 insertions(+) __

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

commit 8e100d1a17d497d99c10c13db53442ff9e56063f Merge: 5c03bb7c0 c55a05423 Author: Nick Mathewson Date: Mon Dec 11 16:43:24 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid taking the 030 version of 23862.

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

commit 5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8 Merge: 7fae562a4 3bca705c5 Author: Nick Mathewson Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

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

commit 7fae562a4da62090817f8546e8f4a8a29dcf1c4a Merge: a12dbbd88 6e3ec8222 Author: Nick Mathewson Date: Fri Dec 1 09:35:25 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump. ___ tor-commits mail

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

commit 6b9c2ac23e7dfbaeaefc1fd5923645850668e7af Merge: ee48eb1eb f2ecdeb72 Author: Nick Mathewson Date: Thu Nov 30 12:25:07 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" to avoid version bump. ___ tor-commits mailing l

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

commit ee48eb1eb5e643cd8af2a32df3cf8c48965f6ce4 Merge: 500f04a74 5fc0587c0 Author: Nick Mathewson Date: Thu Nov 30 12:07:59 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24313 | 5 + changes/trove-2017-009 | 10 ++ changes/trove-2017-010

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

commit 500f04a74e22686f7659adecea02569b3459c71b Merge: 703ab95e9 766d0a2d9 Author: Nick Mathewson Date: Thu Nov 30 11:48:12 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug21394 | 9 + src/or/dns.c | 23 --- 2 files changed, 29 insertions

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

commit 703ab95e9fb94700b6349f539c58705040ede9a8 Merge: 735855952 b1c4ab0be Author: Nick Mathewson Date: Mon Nov 27 09:09:34 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bastet_v6 | 4 src/or/config.c | 1 + 2 files changed, 5 insertions(+)

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

commit 73585595245ac9551a1982575941e954bb870ad0 Merge: 1d5e693b6 2d849716d Author: Nick Mathewson Date: Sat Nov 18 11:02:42 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug18329-minimal | 6 ++ src/or/router.c | 9 + 2 files changed, 15 insertions(+)

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

commit 1d5e693b63bffe06cb69932176eb0ac4ea4decbd Merge: 562b3c967 50fbede45 Author: Nick Mathewson Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 -

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

commit 562b3c96783628a57f60bb8adf80a0263f3b3d68 Merge: 7df28ce29 fea5c8a01 Author: Nick Mathewson Date: Mon Nov 13 12:57:58 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit 91188540af1ce185e7aa7ab19467a42bc9ea7722 Merge: 89b9951ec 16bdb9e36 Author: Nick Mathewson Date: Mon Nov 13 11:18:02 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23470 | 6 ++ src/or/directory.c | 22 +++--- 2 files changed, 17 insertions

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

commit 89b9951ecd5b12eefc796604bc7560ce4a5308d9 Merge: 0fc2b7f82 9092e9019 Author: Nick Mathewson Date: Mon Nov 13 11:15:50 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit 2777b469fa9e62763cdaee94c10446cf49d7d378 Merge: ef9251157 ece63105d Author: Nick Mathewson Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit ef9251157707aa77e1ba888a34bf65027188f2be Merge: 5a21b2708 5348c8996 Author: Nick Mathewson Date: Sat Nov 11 12:23:34 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2017-11-06 |4 + src/config/geoip | 9406 ---

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

commit 5a21b27083640aec1e23e21cdfcad02625659e05 Merge: 7c2f688fb f2e23d38a Author: Nick Mathewson Date: Tue Oct 31 11:43:14 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23693 | 6 ++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

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

commit 7c2f688fb9b73c2aba6df9bd8792487e8d96cecc Merge: f68c1b140 6ce8cc5db Author: Nick Mathewson Date: Wed Oct 25 09:28:49 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump ___ tor-commits mail

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

commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump ___ tor-commits mail

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

commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump ___ tor-commits mail

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

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d Merge: af33fdd7c 9ae4ffc07 Author: Nick Mathewson Date: Mon Oct 23 15:55:48 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 + 2 files changed, 8 insertions(+) _

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

commit 85115796bb9095db2b59624b16c005f2252d4d71 Merge: 23e3d57e1 eac4c374e Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _

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

commit 23e3d57e12bd0ca4bedae2307440e08e22744802 Merge: df57d1e0c c93ecb818 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

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

commit df57d1e0c0e3e19dc4963391ad7f80ead3ab4f0d Merge: b68de63eb 783e458c0 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

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

commit b68de63eb614061b33a84feb61804745b397a87d Merge: 9120ac221 74e8fd22c Author: Nick Mathewson Date: Mon Oct 23 08:53:25 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23690 | 5 + src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+) _

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

commit 9120ac2218cd7872b7065ab829f061a6287941c2 Merge: 5d37d2700 35574d4a9 Author: Nick Mathewson Date: Mon Oct 23 08:47:58 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list tor-commits@lists.torproject.org ht

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

commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list tor-commits@lists.torproject.org ht