[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 411074501789d742b412034a9299c8e3d0569347 Merge: 3a073c463 82f109c2b Author: Nick Mathewson Date: Thu Sep 28 18:54:18 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23551 | 3 +++ src/common/compress.c | 7 +++ 2 files changed, 10 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit cce936aee07271717440f5538cbebf4fafb9e420 Merge: 91467e04b 9b0264181 Author: Nick Mathewson Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit c92ecac8bbac1d3bb1961f4210129011ce910c7d Merge: 6045bdd4a 7f3dc8327 Author: Nick Mathewson Date: Thu Sep 21 14:39:17 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23610 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --cc changes/bug23610

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit c7b7cf8e18f23a16eaca0520d90f5044fd646857 Merge: ac8e26a41 d70a793cf Author: Nick Mathewson Date: Thu Sep 21 10:39:10 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23608 | 4 src/test/test_channelpadding.c | 43

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit ff0aabc35d3688410846d7fee1a0dc9220b189ef Merge: 427ae164f 1a26c6be8 Author: Nick Mathewson Date: Wed Sep 20 09:45:07 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23568 | 4 src/common/compress_zstd.c | 8 2 files changed, 8

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit a8f4f5742e89c084b96a24bd8e1add0025479f54 Merge: 4a3b61a5b 654820ec1 Author: Nick Mathewson Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.3.1' changes/longclaw-ipv6 | 6 ++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 7fcae5bffa336e089b6b0dd9e30504f08f9f3976 Merge: 3bb6028a8 346066a42 Author: Nick Mathewson Date: Tue Sep 19 13:08:59 2017 -0400 Merge branch 'maint-0.3.1' .gitignore | 1 + 1 file changed, 1 insertion(+) ___

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 8d300c48e77ae995e09f8c5de45a1ebd4a960536 Merge: 32858610c 586c327e0 Author: Nick Mathewson Date: Mon Sep 18 14:40:50 2017 -0400 Merge branch 'maint-0.3.1' "ours" to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit aaf0fa6d1177c045a46ad1e5d6321396bf3690cd Merge: 0bd62c1d9 63ae9ea31 Author: Nick Mathewson Date: Mon Sep 18 10:48:31 2017 -0400 Merge branch 'maint-0.3.1' src/test/hs_ntor_ref.py | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit c7d0096f9ddde0d8663b40f17110ded40309e09a Merge: dd8eeabfd 23c4592ee Author: Nick Mathewson Date: Mon Sep 18 09:42:30 2017 -0400 Merge branch 'maint-0.3.1' changes/trove-2017-008 | 5 + src/or/rendservice.c | 4 ++-- 2 files changed, 7 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 639766dbc39c37d9864b99bd024faa5967b22c80 Merge: a01e4a1a9 49b5ad6b7 Author: Nick Mathewson Date: Fri Sep 15 14:40:35 2017 -0400 Merge branch 'maint-0.3.1' Resolve conflict with 23532 code. changes/bug23533| 4 src/or/channel.c| 2 +-

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 199f13755b5bba85ee39ba9d60387aeef8225844 Merge: 2c9f8badb b440560b8 Author: Nick Mathewson Date: Fri Sep 15 09:33:41 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 536df218753df256fe201ee1178fb595f3cbfa0e Merge: c3063f243 2446d4acc Author: Nick Mathewson Date: Thu Sep 14 13:22:11 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit fecad31f10271b1578d95fd87580898ee492d247 Merge: 72b802001 471e0096a Author: Nick Mathewson Date: Thu Sep 14 10:15:38 2017 -0400 Merge branch 'maint-0.3.1' src/or/entrynodes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 3de63fe4b13dec4b8bc876e1e402dc0bf3e93fff Merge: 3247518f2 6fc47062a Author: Nick Mathewson Date: Thu Sep 14 07:58:11 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23077 | 4 +++ src/test/test_channelpadding.c | 56

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 3092c8bb3e5eef94016327a83b07bab1c4ab3694 Merge: 9c27f56cd eb078a3bd Author: Nick Mathewson Date: Tue Sep 12 17:09:47 2017 -0400 Merge branch 'maint-0.3.1' changes/bug15582 | 4 src/test/test_util.c | 21 - 2 files changed, 20

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 8eef7fc845d76da287dd0888b6753178118f7193 Merge: 5238210da befddf6d2 Author: Nick Mathewson Date: Tue Sep 12 10:30:54 2017 -0400 Merge branch 'maint-0.3.1' changes/bug17857 | 6 ++ src/or/channel.c | 25 -

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 767372f6a0829780f57096cfed9345f636becd37 Merge: 6e4967ef0 469189d84 Author: Nick Mathewson Date: Tue Sep 12 09:24:34 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 007d3d2337edf436cd9860a0430324b6904067e9 Merge: b9ecb522f d4f87073a Author: Nick Mathewson Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 52c40330c8ab0c43c5773349d033ff7e49f02f53 Merge: 67a5d4cb6 72ea4a8f0 Author: Nick Mathewson Date: Mon Sep 11 13:49:20 2017 -0400 Merge branch 'maint-0.3.1' src/common/timers.c | 26 ++ src/common/timers.h | 4 2 files changed, 22

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit ad3f0953e6da8bf95f2dd754b91705d4c7d80a1e Merge: eebfe4f53 7a83cf75d Author: Nick Mathewson Date: Fri Sep 8 08:24:47 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22644 | 5 + src/or/control.c | 16 2 files changed, 17 insertions(+), 4

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit ccb671dc1cf8171a4f0df5940ba71b8cf89c04d3 Merge: 841f48ac4 fd0a894d2 Author: Nick Mathewson Date: Tue Sep 5 10:21:05 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 73d7526fb42edbadd03770ba8fdcbf7bb962a1e4 Merge: e58f11077 7eaf055b2 Author: Nick Mathewson Date: Tue Sep 5 09:26:39 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit e58f11077e7c9f74708c65f1f59b8912e9a8e0b8 Merge: 56df12393 2d55620a9 Author: Nick Mathewson Date: Tue Sep 5 08:31:20 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 42394053c97c32786f1c5505bc9f8aa2d0ca253f Merge: 33989cd00 4d97efd4d Author: Nick Mathewson Date: Mon Sep 4 15:48:12 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22752_simple | 6 src/or/conscache.c | 84

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit e2e13e7c8a2a40074805a19651d7837484d3a8b8 Merge: 209bfe715 a7aeb6f58 Author: Nick Mathewson Date: Mon Sep 4 11:40:02 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23275 | 5 + src/or/main.c | 2 +- src/or/networkstatus.c | 2 +- 3 files

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 209bfe715cc8c1c59b2578c406749a0d4a5bd8cb Merge: be0127ff0 6307a759e Author: Nick Mathewson Date: Tue Aug 29 11:11:12 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22159 | 7 +++ src/or/rendservice.c | 34 +++--- 2 files

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit be0127ff09104b002756f47a6ba72277bb2f76d4 Merge: 3cf8da02f 5e08cf350 Author: Nick Mathewson Date: Tue Aug 29 11:01:19 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit ef6ed0f211dc0fcbfdcdb74d896e825cdc37ae9f Merge: c107aae3c 63fc23f82 Author: Nick Mathewson Date: Mon Aug 28 11:44:25 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit b91dce9454c3db669a07968b25a4fa03d8526917 Merge: 0de3147bf 6069c829f Author: Nick Mathewson Date: Fri Aug 25 11:39:38 2017 -0400 Merge branch 'maint-0.3.1' changes/bug19418 | 7 +++ src/common/tortls.c| 21 ++---

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 8f8a061b0c4724adebb4af1d5ac3edb7381269d5 Merge: 6f3208670 10b242822 Author: Nick Mathewson Date: Mon Aug 21 15:08:17 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23291| 3 +++ src/test/test-memwipe.c | 2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 6247f5a5ba6d300cd64a2639296c3514dcb70066 Merge: 133e1e870 72832086e Author: Nick Mathewson Date: Fri Aug 11 11:51:06 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23155 | 4 src/common/confline.c | 16 +--- 2 files changed, 13

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit b08a2dc95470d448b25e52b702701b432d056d17 Merge: 48a57f981 a47b8fcf9 Author: Nick Mathewson Date: Tue Aug 8 19:29:10 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23139 | 3 +++ src/or/consdiffmgr.c | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 48a57f9815875d8c591f5660e1b7a10d478785ac Merge: 2032b9b1b 5368eaf62 Author: Nick Mathewson Date: Tue Aug 8 10:10:52 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22286 | 3 +++ src/common/compress.h | 2 +- src/common/compress_lzma.c | 10

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 40c7871f46bbfe03480eb159e5365f49e6df24f5 Merge: 17073d723 1168e21b4 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23078 | 7 +++ src/or/hs_intropoint.c | 11 --- 2 files changed, 11

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 17073d7234031c31810837d2f540c0c6c859 Merge: 2624cd63e b13bf6506 Author: Nick Mathewson Date: Thu Aug 3 09:11:03 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23081 | 8 src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 02fcb29d11abe9556ab4d118f2f89e557d1751dd Merge: c4c5077af e220e6e43 Author: Nick Mathewson Date: Thu Aug 3 08:44:32 2017 -0400 Merge branch 'maint-0.3.1' changes/geoip-august2017 | 4 + src/config/geoip | 10796

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit c4c5077af2fad107c9fcebdd3a7999da7b8ee904 Merge: 706364238 a9a8d53de Author: Nick Mathewson Date: Wed Aug 2 12:51:46 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23071| 5 + src/test/hs_ntor_ref.py | 31 --- 2 files

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 706364238e7a1f78c8358f870c1446cb3e214319 Merge: ebce26b5c 830b7b31b Author: Nick Mathewson Date: Wed Aug 2 12:29:42 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 256c1b73e31c0bfb6e48e404f307ca0eb2516408 Merge: c1edd83dd 71248800f Author: Nick Mathewson Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 370a2b9fd18946f292045bd96c5b3381d32f4877 Merge: e72734959 9c294d29e Author: Nick Mathewson Date: Tue Aug 1 12:08:53 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump. ___

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 39ade001a70178adcd63c12a7246a23ab4d07534 Merge: ba7d6a1e1 b2d528d3b Author: Nick Mathewson Date: Tue Aug 1 11:30:33 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit ba7d6a1e141b23f1963567b34eb2d8c33d652218 Merge: 2ee1a084f 751c71827 Author: Nick Mathewson Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 2ee1a084f2432a0bda8273a17b6fc9b5dbdc21f5 Merge: 069728bdd bf91b6e05 Author: Nick Mathewson Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 069728bdd78d5fe4e3bed796ba0fc343a3ded3a8 Merge: a05ceaaeb 9b65d7f41 Author: Nick Mathewson Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit a05ceaaeb6c897313a90b70fabcddc0bd3ef4e61 Merge: 64e560010 5a739e59a Author: Nick Mathewson Date: Tue Aug 1 11:21:19 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 64e5600103b6def4834a127f645fb1b54934c59b Merge: 18115b5aa 4a19498ed Author: Nick Mathewson Date: Tue Aug 1 11:19:30 2017 -0400 Merge branch 'maint-0.3.1' changes/geoip-july2017 | 4 + src/config/geoip | 10075

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit f0d440681c022deb7a5dd34a1ea0c7a1805cafcc Merge: 572f23a96 2cb8c8d99 Author: Nick Mathewson Date: Mon Jul 31 14:32:01 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 5f0fa480dd94f4fec7b8b026dbd0a524f7b9c786 Merge: 6252e04a3 eb677c587 Author: Nick Mathewson Date: Fri Jul 28 09:54:39 2017 -0400 Merge branch 'maint-0.3.1' src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --cc src/test/test_hs.c

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 15ed1c0c833ae30dd7560da3280cd8ca084ff566 Merge: c2844d537 ba334c00d Author: Nick Mathewson Date: Thu Jul 27 16:30:52 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22883-priority | 8 +++ changes/more-threads| 3 + changes/multi-priority

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit b387dd364f44ff79aff7c4c71a3bff9dd21b1623 Merge: 836d628fc ced2dd5f9 Author: Nick Mathewson Date: Thu Jul 27 08:23:37 2017 -0400 Merge branch 'maint-0.3.1' changes/bug20247 | 4 src/common/sandbox.c | 8 2 files changed, 12 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 836d628fc5a8974be09e58c32d2bc178874d50c2 Merge: ca9834c5c 1c5a76f0c Author: Nick Mathewson Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.1' .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit ca9834c5ca906c31a7c3259f4008a4d4d0cf69f1 Merge: 8d3c3f039 ebb0ac338 Author: Nick Mathewson Date: Wed Jul 26 15:38:48 2017 -0400 Merge branch 'maint-0.3.1' .travis.yml | 99 changes/bug22636 | 8

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 8d3c3f039d89bf27cdb825fcb4806c9135597154 Merge: 8b5b3b5fb 431c8d09e Author: Nick Mathewson Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23030_029 | 7 +++ src/common/util_bug.h | 13 + 2 files changed, 20

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 8b5b3b5fb45cccd9349243a2c546ca1419aa8c15 Merge: 514136009 30a98c765 Author: Nick Mathewson Date: Wed Jul 26 12:54:41 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22927 | 6 ++ src/common/compress_zstd.c | 29 +++-- 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 5141360099158b35eee1e9287d2dbc2ac5e808ab Merge: b9ad49844 d068f3359 Author: Nick Mathewson Date: Wed Jul 26 12:53:38 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22915 | 3 +++ src/common/util.c | 16 2 files changed, 19 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit d0816a040dbb9a5e18b76b3fb30011b19f6660b0 Merge: ce5d8c9 52c1754 Author: Nick Mathewson Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22916_027| 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+),

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit ce5d8c92dd6d1cbd71ceea562c5be74058ce0e28 Merge: ef4ea86 bbc75fa Author: Nick Mathewson Date: Fri Jul 14 09:06:44 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 66a564fad8a99a21bd6cda6a70982858376b78e9 Merge: ec29cae 66258f8 Author: Nick Mathewson Date: Thu Jul 13 16:55:06 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22883-config | 7 +++ doc/tor.1.txt | 10 ++ src/or/config.c | 1

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit ec29cae8d7e97d652a87d753d93e4289e5a0ed26 Merge: c73b35d 1ea155b Author: Nick Mathewson Date: Thu Jul 13 16:52:20 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22520| 5 + src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit c73b35d4288af17920e4a93ff88d759dea685b86 Merge: c59ba01 e6d2059 Author: Nick Mathewson Date: Thu Jul 13 16:51:18 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22830 | 5 + src/rust/tor_util/include.am | 2 +- src/test/test_rust.sh|

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 3aba8490ba590899b6c23071ef0b4269d8c36d37 Merge: 4984d62 5636b16 Author: Nick Mathewson Date: Wed Jul 12 10:16:06 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22349 | 9 + src/or/dirserv.c | 56

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 4984d6242af07b3e6b7d64dd2d82ada3fee564a2 Merge: 7b23640 e111cfc Author: Nick Mathewson Date: Wed Jul 12 09:24:01 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22892| 4 src/test/test_crypto_slow.c | 3 +++ 2 files changed, 7 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 7b2364035a6f80fd3158e1b6d7b0034989aefb38 Merge: d730449 1ff98a7 Author: Nick Mathewson Date: Mon Jul 10 15:27:16 2017 -0400 Merge branch 'maint-0.3.1' changes/ticket22870 | 5 + src/test/test_consdiff.c | 16 2 files changed, 13

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit aa792fd20a2a26c5bd4bb4a2d62ab89bcc55f2c5 Merge: 9e4b698 c1bdc3b Author: Nick Mathewson Date: Fri Jul 7 10:57:27 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 9e4b6986f997a6ecbcb07ba7a0ad9f060fd09355 Merge: 66c1bc9 0e5cf4a Author: Nick Mathewson Date: Fri Jul 7 10:51:28 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22789 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 93bd60e5b01beccbc0b5ac7c46d95660624f4ad6 Merge: 0dc7d68 2251667 Author: Nick Mathewson Date: Wed Jul 5 17:00:46 2017 -0400 Merge branch 'maint-0.3.1' changes/task-22207 | 4 src/or/networkstatus.c | 14 -- 2 files changed, 16

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 0dc7d68bb57309df11a70c63562d25dd2d1c63ad Merge: a85ee62 15b1357 Author: Nick Mathewson Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.1' src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

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

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit d4f08c74fe4c907291f79dfaf28f94aac359aed6 Merge: e04cc7e 0f97f96 Author: Nick Mathewson Date: Wed Jul 5 11:19:03 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22801 | 5 + src/common/util.c | 12 2 files changed, 17 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit e04cc7e27fdc4ae4767ec29be08609a5e3540f83 Merge: cd77ea7 e88aa98 Author: Nick Mathewson Date: Wed Jul 5 11:16:51 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22797| 4 src/common/compat.c | 19 --- 2 files changed, 16

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 2778032f4a0b65429c5279db003fd5b354115d1b Merge: 0fe7c42 d011126 Author: Nick Mathewson Date: Mon Jul 3 13:26:38 2017 -0400 Merge branch 'maint-0.3.1' scripts/codegen/fuzzing_include_am.py | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit e0aa6bee4adc3eaf32606776b48b68b09b0a6052 Merge: fb33bcb 83dc072 Author: Nick Mathewson Date: Thu Jun 29 18:45:57 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit fb33bcbcf0fff2f5d6fa29d1097a943b1a764572 Merge: 71b9f4f a535735 Author: Nick Mathewson Date: Thu Jun 29 16:36:58 2017 -0400 Merge branch 'maint-0.3.1' "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 71b9f4f0bb8fe62bbc5c8b92d5172a6d5ba0f068 Merge: 3781678 1712dc9 Author: Nick Mathewson Date: Thu Jun 29 15:57:49 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22753 | 7 +++ src/or/entrynodes.c| 39

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 3781678a3c38fbbf95abea9c055d08ca20b870f6 Merge: 2c718c1 31a08ba Author: Nick Mathewson Date: Thu Jun 29 11:38:06 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22670| 4 + changes/bug22670_02 | 4 + changes/bug22670_03 | 6 ++ src/or/directory.c

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 2c718c1a12f06bdaa9c735a8d201c20b7ca4cfac Merge: bb5968c 0ac8f0b Author: Nick Mathewson Date: Thu Jun 29 10:43:50 2017 -0400 Merge branch 'maint-0.3.1' changes/diagnose_22752 | 4 src/common/storagedir.c | 6 -- src/or/consdiffmgr.c| 6 +- 3

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 0f3084c4f2b6018d4f8b5f6d6868c7c3801eb45d Merge: 0c1586d 912f366 Author: Nick Mathewson Date: Wed Jun 28 14:03:23 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 0c1586d1b8ca68b49b0a38f596b03ca98feb6297 Merge: 590cfe2 054d7c5 Author: Nick Mathewson Date: Wed Jun 28 13:58:37 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 590cfe2b89626e277075ffed466e2dfd7a0107f8 Merge: c520a2d c57a119 Author: Nick Mathewson Date: Wed Jun 28 13:54:12 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit c520a2de3b928054432a14046769919cb9eeda8e Merge: 01404d7 6b2c886 Author: Nick Mathewson Date: Wed Jun 28 13:49:28 2017 -0400 Merge branch 'maint-0.3.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 01404d7c52a7c9b5756a73d662811da70d7a8378 Merge: a794fb7 c239b2f Author: Nick Mathewson Date: Wed Jun 28 12:25:09 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22751 | 5 + src/common/sandbox.c | 10 -- 2 files changed, 13 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 559195ea82bf1c0610898fd96cd5a835b2e4f9a7 Merge: 733ce55 2cd49d9 Author: Nick Mathewson Date: Tue Jun 27 18:28:38 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22702 | 5 + src/or/consdiffmgr.c | 18 ++ src/or/consdiffmgr.h | 3 +++

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 0576f9f433f20af756bdaba6df5ac270d147e007 Merge: 22f441d 32eba3d Author: Nick Mathewson Date: Tue Jun 27 11:04:44 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22737 | 12 src/or/connection_or.c | 4 +++- 2 files changed, 15

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 22f441d4ee40a6d1c9615aeb2b08b872549abfd0 Merge: f6df433 fd16dd2 Author: Nick Mathewson Date: Tue Jun 27 10:32:50 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22719 | 7 +++ src/or/buffers.c | 11 +-- 2 files changed, 16 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit f6df433b9123c50b8eda6d8784d4f96be6d02f51 Merge: c29a559 3259601 Author: Nick Mathewson Date: Mon Jun 26 14:30:21 2017 -0400 Merge branch 'maint-0.3.1' src/test/fuzz/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit c29a559e7ba36933cf9d6405017018c5817dde51 Merge: 06414b9 d72cfb2 Author: Nick Mathewson Date: Mon Jun 26 14:15:21 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22720 | 9 + src/or/control.c | 2 +- src/or/main.c| 4 ++-- 3 files changed, 12

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 06414b992201764e885962d5ed27bcae699745be Merge: 82a68be 8f59661 Author: Nick Mathewson Date: Mon Jun 26 11:39:43 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22212 | 5 + src/or/channelpadding.c| 16 +---

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 82a68be69a696e8aa96203ad00d1f0cda24fee4f Merge: acbe16a 0c7c494 Author: Nick Mathewson Date: Mon Jun 26 10:32:57 2017 -0400 Merge branch 'maint-0.3.1' src/common/storagedir.c | 2 ++ 1 file changed, 2 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 90046a09dd95c789e28f63c320c1c16e58ecf57a Merge: ee7101a 2c49a98 Author: Nick Mathewson Date: Thu Jun 22 10:56:08 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22400_01 | 4 src/or/entrynodes.c | 36 +--- 2 files

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 5d3f484f4ac4f45c0404b1f8b998983636f2a693 Merge: 72b132e 784b29a Author: Nick Mathewson Date: Wed Jun 21 13:54:07 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22356 | 5 + src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

commit 884c0ffe3b4266e66adbd6bb914c3b3b00401acb Merge: 3830599 e51e7bd Author: Nick Mathewson Date: Tue Jun 20 20:29:00 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22669 | 4 changes/bug22672 | 5 src/common/compress.c | 44

<    1   2   3   >