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

commit 7ef22d0bf04f1b703e8d01b7d172bc0b82e0257d Merge: 61d0f65cf 1a26c6be8 Author: Nick Mathewson Date: Wed Sep 20 09:45:07 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23568 | 4 src/common/compress_zstd.c | 8 2 files

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

commit 61d0f65cf00f3191112b54d81bb0ef97cf68493e Merge: 1115200d9 654820ec1 Author: Nick Mathewson Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit 1115200d979eebd6b52d5797f329a65d8649bd33 Merge: ac21fb8c6 346066a42 Author: Nick Mathewson Date: Tue Sep 19 13:08:59 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .gitignore | 1 + 1 file changed, 1 insertion(+)

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

commit ac21fb8c68d2931293ddd0d70a024ef17f065191 Merge: 6babd3d9b 586c327e0 Author: Nick Mathewson Date: Mon Sep 18 14:40:55 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit 6babd3d9ba9318b38b5af7278875efe84055a1b0 Merge: 9d35ddf11 63ae9ea31 Author: Nick Mathewson Date: Mon Sep 18 10:48:31 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/test/hs_ntor_ref.py | 22 +++--- 1 file changed, 11

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

commit 17e67dce81aef4d701b2be2cd557882c6b302b9a Merge: ee2e3e852 23c4592ee Author: Nick Mathewson Date: Mon Sep 18 09:40:41 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit ee2e3e852adbfdd780a22f8b186f23ccd6c929e9 Merge: d7eef6114 49b5ad6b7 Author: Nick Mathewson Date: Fri Sep 15 14:40:57 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23533| 4 src/or/channel.c| 2 +- src/or/channeltls.c | 2 +-

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

commit d7eef61147d37b45eac53d422025a7ce64392af4 Merge: b05226f05 b440560b8 Author: Nick Mathewson Date: Fri Sep 15 09:34:06 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit b05226f05c4a5de92cfa57e6de1b77622bfdf22a Merge: fd8d526f0 2446d4acc Author: Nick Mathewson <ni...@torproject.org> Date: Thu Sep 14 13:22:17 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 8230b0768b90d43ac1000ac39d18c5e46367d604 Merge: c61e919ec 471e0096a Author: Nick Mathewson Date: Thu Sep 14 10:15:38 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit c61e919ec2211b58f2090e0e0c2ec60804fa2044 Merge: a040b0589 6fc47062a Author: Nick Mathewson Date: Thu Sep 14 07:57:18 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23077 | 4 +++ src/test/test_channelpadding.c | 56

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

commit a040b05890b4f5e74609c922f22a4bf5e9c61660 Merge: 374780733 eb078a3bd Author: Nick Mathewson Date: Tue Sep 12 17:09:47 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit 3747807333093a88c8ae0f6b7a754b803430da63 Merge: 931b2dbae befddf6d2 Author: Nick Mathewson Date: Tue Sep 12 10:30:54 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug17857 | 6 ++ src/or/channel.c | 25 -

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

commit 931b2dbae537a4688a6c71deeb1ea0489efc456a Merge: 77a848b9d 469189d84 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Sep 12 09:24:33 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 77a848b9d47a9f7b19bcb3204056633d7a1bd18f Merge: 8b4ff0168 eaa8224ce Author: Nick Mathewson Date: Mon Sep 11 17:49:18 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22446 | 4 1 file changed, 4 insertions(+)

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

commit 8b4ff0168ac4d9ec758fdf50769067d55c7a061d Merge: 4d4e2fc22 d4f87073a Author: Nick Mathewson <ni...@torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 4d4e2fc22489fcbc2427a3275f6b95cfe4e9ccdd Merge: 6108499c9 72ea4a8f0 Author: Nick Mathewson Date: Mon Sep 11 13:49:12 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/timers.c | 26 ++ src/common/timers.h | 4 2

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

commit 6108499c99aa3cfa5ed7909720630857768c43b1 Merge: 636b5d19a 7a83cf75d Author: Nick Mathewson Date: Fri Sep 8 08:24:47 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22644 | 5 + src/or/control.c | 16 2 files changed,

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

commit 636b5d19ae10f0e2a8a91a87751958178989bf7f Merge: f0fa7a342 54fb1d0f7 Author: Nick Mathewson Date: Thu Sep 7 15:18:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/geoip-september2017 | 4 + src/config/geoip| 10802

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

commit f0fa7a3420d2cfe1a1d28fc06b2e20a491066a1f Merge: c4ecb8f86 9c404602a Author: Nick Mathewson Date: Thu Sep 7 08:51:16 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23105-diagnostic | 4 src/or/relay.c | 3 +++ 2 files

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

commit c4ecb8f86765b75f6fd667dfec36eb1ee518f81a Merge: efc306c59 fd0a894d2 Author: Nick Mathewson Date: Tue Sep 5 10:20:42 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit cf0124b2389431f36f5781a6e7f3181d0590ab0f Merge: b9c29105f 7eaf055b2 Author: Nick Mathewson Date: Tue Sep 5 09:26:39 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/hs_descriptor.c| 2 +- src/or/hs_descriptor.h| 2 ++

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

commit b9c29105f1f8c6a5a50212b84e8dd06b7e9e4ff8 Merge: bebf7eb54 2d55620a9 Author: Nick Mathewson Date: Tue Sep 5 08:31:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit c515fbc7327ce1189c0b511265b2bd6b452003e3 Merge: 3a5cf9aa2 4d97efd4d Author: Nick Mathewson Date: Mon Sep 4 15:48:12 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22752_simple | 6 src/or/conscache.c | 84

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

commit 3a5cf9aa2f50eccbdbbb6f7e04753479c7763e1b Merge: faa28d40e a7aeb6f58 Author: Nick Mathewson Date: Mon Sep 4 11:40:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23275 | 5 + src/or/main.c | 2 +-

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

commit 7ed803749595d9d22a1cf021430b8ec6a3432943 Merge: ff2c31093 6307a759e Author: Nick Mathewson Date: Tue Aug 29 11:11:12 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22159 | 7 +++ src/or/rendservice.c | 34

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

commit ff2c31093a0bb7516397e09c37d8dd6e834e5ca9 Merge: 51d14b3d4 5e08cf350 Author: Nick Mathewson Date: Tue Aug 29 11:01:19 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/test/include.am | 1 + 1 file changed, 1 insertion(+)

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

commit 51d14b3d478a94c410a695f736445f42ccc23fb9 Merge: 1dd0be75c 63fc23f82 Author: Nick Mathewson Date: Mon Aug 28 11:44:25 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket22348 | 5 + src/or/dirserv.c| 7 ++- 2 files changed, 11

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

commit 1dd0be75c2119ab5265725641778bf4d77df4d60 Merge: 882dd4de0 6069c829f Author: Nick Mathewson Date: Fri Aug 25 11:39:38 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug19418 | 7 +++ src/common/tortls.c| 21

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

commit 882dd4de0b5dd13674ff4530af0c8c43b389ff33 Merge: 9944fd92c 10b242822 Author: Nick Mathewson Date: Mon Aug 21 15:08:17 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23291| 3 +++ src/test/test-memwipe.c | 2 +- 2 files changed, 4

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

commit 9944fd92ceaa1614d6a54e47c39c2670c4fd66af Merge: 4d5e8378b 6be0e2867 Author: Nick Mathewson Date: Mon Aug 21 14:20:38 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23233| 4 + src/or/hs_descriptor.c | 5 +-

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

commit 4d5e8378be3848c07a9b1026924e879e5642903f Merge: 47e7a167d 72832086e Author: Nick Mathewson Date: Fri Aug 11 11:51:06 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23155 | 4 src/common/confline.c | 16 +--- 2 files

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

commit 47e7a167d23c6ba1492a4006f6275e34c6a57b14 Merge: cbcff6759 a47b8fcf9 Author: Nick Mathewson Date: Tue Aug 8 19:29:10 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23139 | 3 +++ src/or/consdiffmgr.c | 1 + 2 files changed, 4

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

commit cbcff6759d98928d9d252aaf6268f2f679f8b00e Merge: f248a4a38 5368eaf62 Author: Nick Mathewson Date: Tue Aug 8 10:10:52 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22286 | 3 +++ src/common/compress.h | 2 +-

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

commit f248a4a38ee74663a1223dc2f1d083d50dc1f18d Merge: 8e451c5c7 1168e21b4 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit 8e451c5c7c22ed2f48d2378aecfbbc9ae851090a Merge: e084fa419 b13bf6506 Author: Nick Mathewson Date: Thu Aug 3 09:11:03 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23081 | 8 src/or/ntmain.c | 1 + 2 files changed, 9

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

commit e084fa419a77c21c810ef6c65287259e1c9bdd32 Merge: 3938692f3 e220e6e43 Author: Nick Mathewson Date: Thu Aug 3 08:44:32 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 3938692f3280355f6f8d9b43ed5ac5b9c93bb48f Merge: 4872c28af a9a8d53de Author: Nick Mathewson Date: Wed Aug 2 12:51:46 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23071| 5 + src/test/hs_ntor_ref.py | 31

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

commit 4872c28afa5295b81f05def0b763022ac093bd09 Merge: 9409d98ee 830b7b31b Author: Nick Mathewson <ni...@torproject.org> Date: Wed Aug 2 12:29:42 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 9409d98ee930541937c9e6b8e09f7e3097f744c1 Merge: ef592d133 71248800f Author: Nick Mathewson <ni...@torproject.org> Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit ef592d1331f037f474cc0674a9c9ff3eeb7069f0 Merge: 83389502e 9c294d29e Author: Nick Mathewson Date: Tue Aug 1 12:09:04 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit c1b411109e857ba493a34a5ba8f8bad196ca0f26 Merge: 6ddc4d5e2 b2d528d3b Author: Nick Mathewson <ni...@torproject.org> Date: Tue Aug 1 11:30:33 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 6ddc4d5e27e4cc361f23943c8945e76ca2bc4d91 Merge: 026882fa3 751c71827 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 026882fa3d718246153ba91150a43e7ad8a4bdfc Merge: 61ceb2622 bf91b6e05 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 61ceb26229a516c8b7bf23831fc91e41261e13c5 Merge: 883d1957f 9b65d7f41 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 883d1957f650167713be30b04ce5199fce687384 Merge: 09f5077d4 5a739e59a Author: Nick Mathewson <ni...@torproject.org> Date: Tue Aug 1 11:21:19 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit 09f5077d48cc76d6a4805536c781c4d04b69768f Merge: 72aa33c01 4a19498ed Author: Nick Mathewson Date: Tue Aug 1 11:19:30 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/geoip-july2017 | 4 + src/config/geoip | 10075

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

commit 31417631cb5305647423d91df395e4303e475987 Merge: 66801bc90 2cb8c8d99 Author: Nick Mathewson Date: Mon Jul 31 14:32:14 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit 75eaca4e810fcabffea3b23b2ab9460fac020aa5 Merge: 3205700bc eb677c587 Author: Nick Mathewson Date: Fri Jul 28 09:54:39 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

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

commit 3205700bc42bd3350defc569709b562a6adff0fd Merge: 8c2ccf937 911e2dc53 Author: Nick Mathewson Date: Fri Jul 28 09:50:26 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23053 | 5 + src/or/config.c | 1 + 2 files changed, 6 insertions(+)

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

commit 8c2ccf93709d2a842485d15724d5a3e03eabfe32 Merge: a2a5bd83f af3079a49 Author: Nick Mathewson Date: Thu Jul 27 20:33:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/workqueue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

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

commit a2a5bd83f0f38c3a2f46db22e87dee5657cd8160 Merge: 180e21fbc ba334c00d Author: Nick Mathewson Date: Thu Jul 27 16:30:52 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22883-priority | 8 +++ changes/more-threads| 3 +

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

commit 180e21fbc05ed869b00117413134ea19a4bc8cb2 Merge: a2d703319 ced2dd5f9 Author: Nick Mathewson Date: Thu Jul 27 08:23:37 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit a2d70331954aed82b08419191c200e3630be2305 Merge: 4557f3f90 1c5a76f0c Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit 4557f3f9089633e1442d7e955421c65d1e26bcff Merge: 3ada086d3 ebb0ac338 Author: Nick Mathewson Date: Wed Jul 26 15:38:48 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 99

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

commit 3ada086d380845b11e6f35cfde93a02bf2dbbb6e Merge: 745ffd6d3 431c8d09e Author: Nick Mathewson Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit 745ffd6d3a545ecc3dc05982284001a2e01fb740 Merge: f1431f439 30a98c765 Author: Nick Mathewson Date: Wed Jul 26 12:54:41 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22927 | 6 ++ src/common/compress_zstd.c | 29

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

commit f1431f439350948f2ec44e23d17d80de5aca9259 Merge: 4db33ecc0 d068f3359 Author: Nick Mathewson Date: Wed Jul 26 12:53:38 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit 4db33ecc04ef2ad8bb7ef04d8c67b3ae4a46d8bf Merge: 5eefa43 52c1754 Author: Nick Mathewson Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22916_027| 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files

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

commit 5eefa43137863057cf762192b47e4f979b4071a6 Merge: 05ca8ab bbc75fa Author: Nick Mathewson Date: Fri Jul 14 09:06:44 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit 05ca8ab5b69cb51e708e74ddeb32188f5f169ca3 Merge: 11b2d36 66258f8 Author: Nick Mathewson Date: Thu Jul 13 16:55:06 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22883-config | 7 +++ doc/tor.1.txt | 10 ++

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

commit 11b2d36db3b14fb1fd17b021757764bb898b7440 Merge: 4d52b74 1ea155b Author: Nick Mathewson Date: Thu Jul 13 16:52:20 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22520| 5 + src/common/compat.c | 2 +- 2 files changed, 6

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

commit 4d52b740f982d4f0078ae13fd4a582d1c4fceabc Merge: d5c1b7f e6d2059 Author: Nick Mathewson Date: Thu Jul 13 16:51:18 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22830 | 5 + src/rust/tor_util/include.am | 2 +-

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

commit d5c1b7f1855caaa08c1a3f2620d356a4de36b343 Merge: 9665bad 5636b16 Author: Nick Mathewson Date: Wed Jul 12 10:16:06 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22349 | 9 + src/or/dirserv.c | 56

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

commit 9665bad777c02cfdd50f7473781a3a070b70c79a Merge: 47982cd e111cfc Author: Nick Mathewson Date: Wed Jul 12 09:24:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22892| 4 src/test/test_crypto_slow.c | 3 +++ 2 files

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

commit 47982cdc0951b5cdae5b5cc6dbfea33d228f3950 Merge: 0be10dd 1ff98a7 Author: Nick Mathewson Date: Mon Jul 10 15:27:16 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket22870 | 5 + src/test/test_consdiff.c | 16 2

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

commit 0be10dde5aef4859dff04db23cf263c026e3f1c9 Merge: ab1c182 c1bdc3b Author: Nick Mathewson <ni...@torproject.org> Date: Fri Jul 7 10:57:27 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 _______ tor-commits mailing list tor-c

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

commit ab1c182127597111abe969f783b04265d5d0ed20 Merge: 251316c 0e5cf4a Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit f6a36996dbe31b813e52bd32959db2d1e35b012a Merge: 0203000 9919638 Author: Nick Mathewson Date: Wed Jul 5 17:37:14 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/networkstatus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

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

commit 02030009c5b150fe4cb3d46e0c4fab09e9654de7 Merge: adae5d3 2251667 Author: Nick Mathewson Date: Wed Jul 5 17:00:46 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/task-22207 | 4 src/or/networkstatus.c | 14 -- 2 files

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

commit adae5d3b69fdac78cd6fba428e3bff61d71f4bff Merge: c8e6b2e 15b1357 Author: Nick Mathewson Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit c8e6b2e4bf2b98ac227ddbfc8796e401bba0b674 Merge: d9663a2 9383fa3 Author: Nick Mathewson Date: Wed Jul 5 15:57:09 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit d9663a25135ca676c1bd66f28f0db277a3764f65 Merge: fe2a9cb 5434b24 Author: Nick Mathewson Date: Wed Jul 5 13:43:31 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22789 | 6 ++ src/common/compat.c | 8 ++-- src/test/test_addr.c |

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

commit fe2a9cb3894fc59e812fe0c9cb18a7fe81a6cdb8 Merge: 402f4bc 0f97f96 Author: Nick Mathewson Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.3.1' into release-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.1' into release-0.3.1

commit 402f4bcef1b4dc9d2800e02ddb5ffc217dea81c3 Merge: ba45eec e88aa98 Author: Nick Mathewson Date: Wed Jul 5 11:16:51 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22797| 4 src/common/compat.c | 19 --- 2 files

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

commit ba45eec74363cd77553a7e3edb0f5bb355241806 Merge: 26c9afc d011126 Author: Nick Mathewson Date: Mon Jul 3 13:26:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 scripts/codegen/fuzzing_include_am.py | 9 ++--- 1 file changed, 6 insertions(+), 3

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

commit 26c9afc3860494457b20a33b65d7c2bd459cdd94 Merge: fab91a2 83dc072 Author: Nick Mathewson Date: Thu Jun 29 18:48:33 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit 07862d84359360e6ea3d7fa2dfae47ad8f8fb264 Merge: d9c230e a535735 Author: Nick Mathewson Date: Thu Jun 29 16:37:21 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit b2ae5fc96bf82501f100c882e433100439346d63 Merge: 62c87f8 1712dc9 Author: Nick Mathewson Date: Thu Jun 29 15:57:48 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22753 | 7 +++ src/or/entrynodes.c| 39

<    1   2