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

commit 2968c716d7689eafcf32a1f5327af7b1ad1582ce Merge: a3ec89a4f 1953a7e61 Author: Nick Mathewson Date: Fri Jun 29 23:11:47 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 scripts/maint/checkSpace.pl | 5 - 1 file changed, 5 deletions(-) diff --cc scripts/maint/checkSpace.pl

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

commit a3ec89a4f8a6222403697b7f7fce5d5138b79994 Merge: d583459d5 3c0a63c40 Author: Nick Mathewson Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_shared_random.c | 1 + 1 file changed, 1 insertion(+)

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

commit 1385a5118d55edd3dd672eeb793b662853f30758 Merge: d6d3f8486 b426e83f0 Author: Nick Mathewson Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c| 7

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

commit ea14d3408df7c846722b54484cf5b8d61de5384f Merge: b89a66e99 890bc15ab Author: Nick Mathewson Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26467 | 3 +++ 1 file changed, 3 insertions(+) ___

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

commit d6d3f8486dbac9837a793f431dcd58505e7274e4 Merge: 340fcc7e2 fcd26af7c Author: Nick Mathewson Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/feature26372_029 | 4 configure.ac | 6 +- 2 files changed, 9 insertions(+), 1

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

commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

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

commit 19f386852333a6de5fbf9bcb3a4415b3bb135b4d Merge: 1ef8023e0 ae540569c Author: Nick Mathewson Date: Tue Jun 12 08:11:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-06-07 |4 + src/config/geoip | 5848

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

commit 1ef8023e000d9136b7069515f9d7303810a8f3b2 Merge: f48fb8a72 719b5c1d2 Author: Nick Mathewson Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26196 | 4 src/or/protover.c | 13 + 2 files changed, 17 insertions(+)

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

commit f48fb8a720c7cca79249248f92e3bc99cee3414d Merge: d3a972561 c380562ae Author: Nick Mathewson Date: Thu May 24 09:40:06 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26116 | 7 +++ src/common/crypto.c| 7 ++-

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

commit d3a972561aeb38d7b346be1826054c60bf3adfaa Merge: 502d2c006 d1e4ffc71 Author: Nick Mathewson Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26072 | 5 + src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

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

commit 502d2c00625501f312496d842aeb16a840d4d7b0 Merge: 2d61a8351 033e4723f Author: Nick Mathewson Date: Tue May 15 09:32:44 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-05-01 |4 + src/config/geoip | 5455

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

commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3 Merge: 6361a250f bca8a104b Author: Nick Mathewson Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26062| 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3

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

commit 6361a250f08421aa1e6db1093aaa488ee24ce77d Merge: 726f238b7 5227754b2 Author: Nick Mathewson <ni...@torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 _______ tor-commits mailing list tor-c

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

commit 993e314c6f08d587480070e9f19d313b81b39a09 Merge: bb35405d2 d465bd27e Author: Nick Mathewson Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26007 | 5 + src/or/dirserv.c | 13 +++-- 2 files changed, 16

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

commit 5cc3a0379eba0eb4e9baac97468fcaebcc654437 Merge: e88863407 34e7dca9c Author: Nick Mathewson Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 5 - changes/travis_distcheck | 4 2 files changed,

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

commit 5c3639923fb3d7a1bfc7b38248001e67333fa35e Merge: ce8e7427b 9727b4c5d Author: Nick Mathewson Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6

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

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11

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

commit 5e0fbd7006993a4e402f2eee49f6f86074923197 Merge: db6902c23 0e13ff481 Author: Nick Mathewson Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit db6902c23530f8d58e999701685e9cbd74b15a82 Merge: e813116d3 10a1969ca Author: Nick Mathewson Date: Tue Apr 10 14:26:29 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33

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

commit 834eef2452a667c5557e5a09bb879cc2fc98a661 Merge: 5acfc3087 b68e636b3 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

commit 5acfc3087663340f55de6081cdd13b484525f43a Merge: 068d09274 4bb7d9fd1 Author: Nick Mathewson Date: Tue Mar 27 18:23:53 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug25629 | 3 +++ src/or/nodelist.c | 13 ++--- 2 files changed, 9

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

commit 068d092749508bae84e6d5fce605d2f40c1bdb80 Merge: 1aa0ae2cc 9f93bcd16 Author: Nick Mathewson Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/feature25313 | 4 src/common/sandbox.c | 23 ++- 2

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

commit 1aa0ae2cc3547a35a44967ed56c1f78a42c076f8 Merge: 0e7f15fdb 3370b3cfe Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 24 1 file changed, 20 insertions(+), 4

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

commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa Merge: 0aa794d30 67a313f0e Author: Nick Mathewson Date: Tue Mar 13 10:58:02 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382

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

commit 2e2aacca2aa635a840c57e87e3769403505a19d2 Merge: c527a8a9c 9eb6f9d3c Author: Nick Mathewson Date: Sat Mar 3 11:32:29 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

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

commit 805a785780c2f3abccf080caddc345ca8f484797 Merge: d4a758e08 35753c077 Author: Nick Mathewson Date: Thu Mar 1 16:42:25 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid version bump.

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

commit d4a758e08373854639af6991ec95836fa7c15ca4 Merge: ac1942ac5 c1bb8836f Author: Nick Mathewson Date: Thu Mar 1 16:07:59 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug25249 | 3 + changes/bug25249.2 | 3 +

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

commit 2bcd264a28e2d6bec1e806e779bf82435c9c7505 Merge: 3930ffdf6 cb92d47de Author: Nick Mathewson Date: Fri Feb 16 09:48:11 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24952| 5 + changes/bug25223| 4 +

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

commit 3930ffdf63425c344e14c45cff6780108cfa038b Merge: d21e5cfc2 2b99350ca Author: Nick Mathewson Date: Fri Feb 16 08:47:12 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid conflicts with the cherry-picked fix for 24898.

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

commit f647035b3783eb14c79cea949b36efa97861fbc2 Merge: 17a923941 f0ed7895c Author: Nick Mathewson Date: Tue Feb 13 16:55:18 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug21074_downgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 17a923941a41d9283cad0cb093024c872fafdb0a Merge: 91109bc81 e658dad62 Author: Nick Mathewson Date: Tue Feb 13 08:50:58 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket25170 | 5 + src/or/dirserv.c| 10 -- 2 files changed,

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

commit 91109bc813211516e34f25fc4418211488a8ab57 Merge: b2c4d4e7f e91bae66d Author: Nick Mathewson Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug23318| 11 +++ changes/bug24170| 3 +++ src/or/routerlist.c

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

commit b2c4d4e7fae3dda864282953c05ab3b9b0f1b22d Merge: 8939eaf47 84c13336c Author: Nick Mathewson Date: Sun Feb 11 18:11:04 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24198 | 4 src/common/sandbox.c | 16 +++- 2 files

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

commit 8939eaf479bc123e774421c9de6dfc3c864e0326 Merge: eccef6ba6 848ba26c1 Author: Nick Mathewson Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket24315 | 3 +++ configure.ac | 2 ++ src/common/sandbox.c | 71

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

commit eccef6ba60e59c6d7001d8f6623eb4d01ea8ca11 Merge: 86583ad78 5dc785cee Author: Nick Mathewson Date: Sun Feb 11 16:51:56 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug21074_downgrade | 4 src/common/compat.c| 14 +++--- 2

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

commit 86583ad78e6c75ea0094553584428f795089c482 Merge: 04a8e81fa 320dac460 Author: Nick Mathewson Date: Sat Feb 10 16:09:00 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24978 | 7 +++ src/common/ciphers.inc | 21 -

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

commit 04a8e81fa9d323819a7294f80aca9477794386bc Merge: 9cbc40e37 0ddc2dc53 Author: Nick Mathewson Date: Thu Feb 8 10:29:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-02-07 | 4 + src/config/geoip | 34364