[tor-commits] [tor/release-0.3.1] 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.1] 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.1] 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.1] 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.1] 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

[tor-commits] [tor/release-0.3.1] 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 ++--

[tor-commits] [tor/release-0.3.1] 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.1] 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

[tor-commits] [tor/release-0.3.1] 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.1] 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

[tor-commits] [tor/release-0.3.1] 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.1] 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 +-

[tor-commits] [tor/release-0.3.1] 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

[tor-commits] [tor/release-0.3.1] 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.1] 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

[tor-commits] [tor/release-0.3.1] 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] [tor/release-0.3.1] 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] [tor/release-0.3.1] 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 ++

[tor-commits] [tor/release-0.3.1] 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

[tor-commits] [tor/release-0.3.1] 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

[tor-commits] [tor/release-0.3.1] 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 +++

[tor-commits] [tor/release-0.3.1] 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] [tor/release-0.3.1] 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

[tor-commits] [tor/release-0.3.1] 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] [tor/release-0.3.1] 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] [tor/release-0.3.1] 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.1] 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.1] 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] [tor/release-0.3.1] 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] [tor/release-0.3.1] 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] [tor/release-0.3.1] 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

[tor-commits] [tor/release-0.3.1] 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.1] 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

[tor-commits] [tor/release-0.3.1] 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

[tor-commits] [tor/release-0.3.1] 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

[tor-commits] [tor/release-0.3.1] 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] [tor/release-0.3.1] 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] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

commit 7a4741c2336341449212f635672102d5ba391276 Merge: bdf60fc7c f7f55acae Author: Nick Mathewson Date: Thu Oct 5 11:04:59 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-october2017 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit bdf60fc7ce40d5f78ac1f995447d104be48cbcea Merge: 82f109c2b ad7db1077 Author: Nick Mathewson Date: Thu Oct 5 11:03:36 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-october2017 |4 + src/config/geoip | 8683

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

commit 9b02641812c05ef2fb0d3148aaee023d89fb9af8 Merge: 7f3dc8327 dc5c9af6c Author: Nick Mathewson Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit 654820ec1ca79f5938db81b6d78c452afa1cd9a6 Merge: 346066a42 746410fb2 Author: Nick Mathewson Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/longclaw-ipv6 | 6 ++ src/or/config.c | 1 - 2 files changed, 6

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

commit 586c327e072ec5a85fcb93cc64e703e201251eb2 Merge: 0e85b7106 23c5259a3 Author: Nick Mathewson Date: Mon Sep 18 14:40:43 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" to avoid version bump.

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

commit 23c4592ee98df59ccfe1a31bf714809caa78ca98 Merge: 49b5ad6b7 139bda4fe Author: Nick Mathewson Date: Mon Sep 18 09:40:40 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/trove-2017-008 | 5 + src/or/rendservice.c | 4 ++-- 2 files changed, 7

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

commit 2446d4acc506842963a2b4d52ddcea95b5f6cccf Merge: 471e0096a e46849846 Author: Nick Mathewson Date: Thu Sep 14 13:22:04 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

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

commit 471e0096ad832ac8d6840254892bde96ea38df45 Merge: 6fc47062a a971018f6 Author: Nick Mathewson Date: Thu Sep 14 10:15:38 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 src/or/entrynodes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit eb078a3bd5bc645177600aff7cbbe59d6e25c3a4 Merge: befddf6d2 dedafe95f Author: Nick Mathewson Date: Tue Sep 12 17:09:47 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug15582 | 4 src/test/test_util.c | 21 - 2

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

commit 469189d84a9b968be7a296c42ac540bf31824124 Merge: eaa8224ce 0729ba286 Author: Nick Mathewson Date: Tue Sep 12 09:24:20 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid torgzip.c change, since torgzip has been replaced.

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

commit eaa8224cef25c1fb27b5f2ef14f836325439f10e Merge: d4f87073a 2b26815e0 Author: Nick Mathewson Date: Mon Sep 11 17:49:18 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22446 | 4 1 file changed, 4 insertions(+)

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

commit d4f87073aec5e8ef6090cf8f246ffd7483968567 Merge: 72ea4a8f0 c894e9d3d Author: Nick Mathewson Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit 7a83cf75dc55dbac91ff5c0daf7c7418493cbea7 Merge: 54fb1d0f7 f5092e711 Author: Nick Mathewson Date: Fri Sep 8 08:24:47 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22644 | 5 + src/or/control.c | 16 2 files changed, 17

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

commit 54fb1d0f7f25266eb85bc9031e5ea95deec5b9be Merge: 9c404602a a9d4df9a0 Author: Nick Mathewson Date: Thu Sep 7 15:18:01 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-september2017 | 4 + src/config/geoip| 10802

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

commit 1168e21b45cb981463fa77a45c2e697bb75d573c Merge: b13bf6506 b548371f7 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23078 | 7 +++ src/or/hs_intropoint.c | 11 --- 2 files

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

commit e220e6e4372dad90cac9138ec21ea91d4f6df7ca Merge: a9a8d53de f33c96610 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 830b7b31b5d7a39f3838d87c0432035d0d9e4245 Merge: 71248800f 8925e84be Author: Nick Mathewson Date: Wed Aug 2 12:28:43 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

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

commit 71248800f72e8ca438f4c61d2c3715258a1b986a Merge: 9c294d29e 4f7955d5d Author: Nick Mathewson Date: Tue Aug 1 14:38:57 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours merge" to avoid version bump.

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

commit b2d528d3be456c12c5c922935d68acceb516824b Merge: 751c71827 4d2620352 Author: Nick Mathewson Date: Tue Aug 1 11:30:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit 751c71827364f1c5d7291cc379c8ba977df1bf37 Merge: bf91b6e05 f69797b67 Author: Nick Mathewson Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit bf91b6e05fcc8195bb79272065aa2dbd2a2d7eeb Merge: 9b65d7f41 84c4a2bc3 Author: Nick Mathewson Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit 9b65d7f4159a70bc83399614548782b458d19851 Merge: 5a739e59a 7c68b2f1a Author: Nick Mathewson Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit 5a739e59a4096841f45b992b9292b3f1af2e0be4 Merge: 4a19498ed 1d48712c2 Author: Nick Mathewson Date: Tue Aug 1 11:21:19 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit 4a19498edcc4bac02582bc351502803cad2bcc98 Merge: 2cb8c8d99 9d24a352c Author: Nick Mathewson Date: Tue Aug 1 11:19:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-july2017 | 4 + src/config/geoip | 10075

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

commit ced2dd5f92c910fb827bac2e70edfc6e5922b21a Merge: 1c5a76f0c ad35e595e Author: Nick Mathewson Date: Thu Jul 27 08:23:37 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug20247 | 4 src/common/sandbox.c | 8 2 files changed, 12

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

commit 1c5a76f0ceeb0e704a52e1f0fd421790b90bebe6 Merge: ebb0ac338 7021d33b9 Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 1a907c659378b1748e65f8d94f7d212a91122247 Merge: 431c8d09e cc4c1840a Author: Nick Mathewson Date: Wed Jul 26 15:37:53 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 This is an "ours" merge to avoid taking any changs from maint-0.3.0: we

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

commit 431c8d09ee062621d8b826799a667f746a783103 Merge: 30a98c765 18734d3b2 Author: Nick Mathewson Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23030_029 | 7 +++ src/common/util_bug.h | 13 + 2 files

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

commit d068f3359f86f5f0d5df693e8e0377d0d45540d4 Merge: 52c1754ff 3c017e823 Author: Nick Mathewson Date: Wed Jul 26 12:53:38 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22915 | 3 +++ src/common/util.c | 16 2 files changed,

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

commit 52c1754ff6b7f181ab40d1f3148ed6a28d60cef5 Merge: bbc75fa f5d2f79 Author: Nick Mathewson Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22916_027| 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed,

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

commit bbc75faed1f7b73104ee706fc469249ad8f3d15c Merge: 66258f8 c1afbbe Author: Nick Mathewson Date: Fri Jul 14 09:06:44 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files

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

commit c1bdc3b10e66de6d79c48c94628956b8578d5f17 Merge: 0e5cf4a 66c85cd Author: Nick Mathewson Date: Fri Jul 7 10:57:05 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 This is an "ours" commit to avoid taking the fix for 22838, which we already have

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

commit 0e5cf4a215f182aedbfaa58579c1c1b6fef3af59 Merge: 9919638 2dd1e21 Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

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

commit 15b13578e89e79d1f2199e05e0b4faba2b64bf9d Merge: 9383fa3 55777b3 Author: Nick Mathewson Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

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

commit 5434b2451e73bd4cd5eb62fb5e6c46870153 Merge: 0f97f96 546f5b3 Author: Nick Mathewson Date: Wed Jul 5 13:43:31 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c | 9

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

commit 0f97f963e3c267852a3f28538c5ddb196ce0bb42 Merge: e88aa98 8bc70a2 Author: Nick Mathewson Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22801 | 5 + src/common/util.c | 12 2 files changed, 17

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

commit 6f2657dbcf81c8f78acb49d487075e66ec9be3c2 Merge: a535735 d9427c0 Author: Nick Mathewson Date: Thu Jun 29 18:44:53 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

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

commit 1494fa0d3b2a3902d0555bc5cc557b88c6130f48 Merge: 1712dc9 98ffb2e Author: Nick Mathewson Date: Thu Jun 29 16:36:05 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump.

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

commit 1712dc98b04ef7b84df67e02da21ea1aa70bc74c Merge: 31a08ba 52c4440 Author: Nick Mathewson Date: Thu Jun 29 15:57:48 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22753 | 7 +++ src/or/entrynodes.c| 39

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

commit 912f366bd5597de6da7d48168d1ed1302702cae3 Merge: 054d7c5 4c21d4e Author: Nick Mathewson Date: Wed Jun 28 14:03:23 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit 054d7c57f64e47d76e167fa6d3cba6353621c7a8 Merge: c57a119 aa5af6a Author: Nick Mathewson Date: Wed Jun 28 13:58:37 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 ___ tor-commits mailing list

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

commit c57a119eb886d705bc2a067635ca7ef8bc74f1de Merge: 6b2c886 75c6fdd Author: Nick Mathewson Date: Wed Jun 28 13:54:00 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid taking redundant ws fix

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

commit 6b2c88649ddb9496d6ae738d2c08436304fed0ea Merge: c239b2f e84127d Author: Nick Mathewson Date: Wed Jun 28 13:49:14 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours" merge to avoid taking backport of 21969

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

commit 2c49a9852dd7b8241f823ea0a0c8d90581518c7d Merge: 784b29a bdd267e Author: Nick Mathewson Date: Thu Jun 22 10:56:08 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22400_01 | 4 src/or/entrynodes.c | 36

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

commit eff5e29404980a87b4618e8623c35a363af6cc04 Merge: 5641e27 71c7019 Author: Nick Mathewson Date: Mon Jun 19 13:52:19 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22516 | 5 + src/common/sandbox.c | 3 +++ 2 files changed, 8