[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit bc8636e89af7a49dfdbb4fd25500ef33fceb04d0 Merge: 4c094436c 6fed66d26 Author: David Goulet Date: Tue Jul 3 13:31:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 2cadd93cea374664f151e945549b95f0b1f49b00 Merge: 75b95e1c8 5b04392c1 Author: Nick Mathewson Date: Fri Sep 21 09:35:51 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27316 | 3 +++ src/or/protover.c| 17 - src/test/test_protover.c

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit a546e07600151be275e6134407c2bcb833a3dd97 Merge: 281854bab 0971b3ce4 Author: Nick Mathewson Date: Fri Sep 14 12:56:30 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27335| 4 src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 8253428253109dabc35861cbaab23a44a22eb24d Merge: 4fa46fca8 9697c2da4 Author: Nick Mathewson Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27658 | 6 ++ src/ext/tinytest.c | 12 ++-- 2 files changed, 16 insertions(+), 2

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 1d8957129b51826b41f8f9efb7b13c4506222bf5 Merge: 8e714d2a0 5a8827a4c Author: Nick Mathewson Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 8afc100cb5fab5dc6e94b1ca13b922c9a1a1fe80 Merge: 05f5f6500 3119cb506 Author: Nick Mathewson Date: Tue Sep 11 12:04:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-09-06 | 4 + src/config/geoip | 49324

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 8cfca28be28f36eec93195f8818ab7adc20426d1 Merge: cff7cb858 8408331b3 Author: Nick Mathewson Date: Mon Sep 10 09:41:55 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit cff7cb858b2dfaacb0138bbe4637a80b58147f6a Merge: 43e400f34 36885f34f Author: Nick Mathewson Date: Fri Sep 7 15:12:09 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" to avoid bump _______ tor-commits mailin

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 732ea9120c9db5d6368cba6f2b789aa4fca5db31 Merge: 056003d60 0366ae224 Author: Nick Mathewson Date: Fri Sep 7 09:15:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27344| 4 configure.ac| 1 + src/common/tortls.c | 7 ++- 3 files changed, 11

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 056003d602a2e6f5c2f417d176b68da50b921c32 Merge: df18cf0e8 987e12a58 Author: Nick Mathewson Date: Fri Sep 7 08:46:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27461 | 5 + src/or/main.c| 8 2 files changed, 13 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit df18cf0e8fa9195df82bef9535f920ad913efab7 Merge: 08d5fd39d a5ed62f96 Author: Nick Mathewson Date: Fri Sep 7 08:44:40 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27463| 3 +++ src/or/rendclient.c | 9 + 2 files changed, 12 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 08d5fd39d85d4f7174b52ef5d53db001398481ea Merge: a7e72f0c4 a08e6e711 Author: Nick Mathewson Date: Fri Sep 7 08:42:19 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27465 | 5 + src/common/address.c | 5 - 2 files changed, 9 insertions(+), 1

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit a7e72f0c44f42145ff39c1ef77fb131c25569732 Merge: 67bdd144b 57b207efa Author: Nick Mathewson Date: Wed Sep 5 10:15:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 67bdd144bd0bc3d6f063ae8b21c67e3f1cb1fbca Merge: a28c14aad 2b1b8bf2c Author: Nick Mathewson Date: Wed Sep 5 09:56:19 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 6 +++--- changes/bug27453 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96 Merge: 64c3c6a79 b40f9967f Author: Nick Mathewson Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457 Merge: 33e4e30d0 70a07fa90 Author: Nick Mathewson Date: Mon Aug 27 09:39:08 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27345| 5 + src/test/include.am | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 33e4e30d0a0aa8717ca67cb82581e536b402f30b Merge: e01ea64f0 98e1a1d10 Author: Nick Mathewson Date: Fri Aug 24 12:32:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/27286| 4 src/or/dirserv.c | 8 2 files changed, 8 insertions(+), 4 deletions(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4 Merge: 8691046ac 36bb11a65 Author: Nick Mathewson Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27185 | 3 +++ src/test/test.c | 10 ++ 2 files changed, 5 insertions(+), 8 deletions(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 8691046ac668282de421bd66c14748faac693749 Merge: 3cfceeb45 c1ad40627 Author: Nick Mathewson Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 Merge: f0633bc49 a5bbe3f1d Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 245025a3dff5ffb893c0cc079a8e5d59df553529 Merge: 4c0c4d4ad d52f40600 Author: Nick Mathewson Date: Tue Aug 21 19:16:40 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27226 | 5 +++ src/common/tortls.c| 10 +++-- src/test/test_tortls.c | 119

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4 Merge: 4847e2216 c798957b5 Author: Nick Mathewson Date: Thu Aug 16 08:37:11 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26932| 3 +++ src/or/hs_service.c | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 4847e221689f702f74d6dd15181216aeabbb6785 Merge: 0fc171a47 db3414dd5 Author: Nick Mathewson Date: Thu Aug 16 08:35:27 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 doc/HACKING/GettingStartedRust.md | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --cc

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 0fc171a47be0cb3b1021816ab80ef823063ce2d1 Merge: 1868982de a26a2735b Author: Nick Mathewson Date: Wed Aug 15 12:20:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27081 | 4 configure.ac | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit fde551a387bf743dd974512f63405c6e63de49b4 Merge: c4d0d9bd2 8982719f6 Author: Nick Mathewson Date: Thu Aug 9 08:47:25 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-08-07 | 4 + src/config/geoip | 14291

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 00536254b765900127af04f278ed591d562434d9 Merge: 2a6c1585b 8e68fe7e1 Author: Nick Mathewson Date: Wed Aug 8 09:26:23 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25440 | 5 + src/common/sandbox.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8 Merge: eb604f5fa 4856a6e6c Author: Nick Mathewson Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug20424_029_minimal | 4 configure.ac | 4 2 files changed, 8 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit a159eaf45fb59fb47732d5d811db2cc78c02a960 Merge: 15d7f24c5 fea35ddf0 Author: Nick Mathewson Date: Mon Jul 30 08:45:01 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26924 | 4 changes/bug26927 | 4 src/or/connection_or.c | 14

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 15d7f24c57828b94596ccfd97081840b920c2336 Merge: dbf57ecf3 a8bdb851e Author: Nick Mathewson Date: Mon Jul 30 08:17:24 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26785 | 4 configure.ac | 3 +++ src/common/compress_zstd.c | 4

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit dbf57ecf39e3066b567c5aade9e8b5575e1e1ec0 Merge: 0a60a94a5 be3a962ca Author: Nick Mathewson Date: Fri Jul 20 10:42:29 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26647 | 4 src/or/control.c| 4 2 files changed, 8 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 0a60a94a558012f3b28162f06216ed5e2a4b5b0c Merge: e0f99404f 209332e71 Author: Nick Mathewson Date: Thu Jul 19 08:31:07 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26853| 3 +++ src/test/test_key_expiration.sh | 8 2 files changed, 11

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit e0f99404f552e047b268c6c47691143a1491ec72 Merge: 9e247ac27 312a42fc8 Author: Nick Mathewson Date: Wed Jul 18 16:39:25 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26787 | 3 +++ 1 file changed, 3 insertions(+) ___

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 9e247ac271b849d1f627d9d8c8d3815b77f8f975 Merge: c31700d66 78386d8cd Author: Nick Mathewson Date: Wed Jul 18 16:39:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_bt.sh | 2 ++ 1 file changed, 2 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit c31700d6640a10eb5e406205c2753e69efd217ec Merge: 28d1057d5 559f79fd7 Author: Nick Mathewson Date: Wed Jul 18 15:04:14 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26485| 4 src/or/config.c | 9 - src/or/dirserv.c| 43

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 28d1057d5658a47dfcaa52c163e5861b4db5670a Merge: 710188f84 61a2762e3 Author: Nick Mathewson Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26830| 3 +++ src/test/test_keygen.sh | 8 2 files changed, 11 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 710188f84e9d6652662901403d0ae31392714306 Merge: f5e3bcb60 98ee23ca1 Author: Nick Mathewson Date: Thu Jul 12 14:32:16 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/task26771| 4 src/or/auth_dirs.inc | 4 ++-- 2 files changed, 6 insertions(+), 2

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 250e0fc1c4b1a4d1fdeb38c43399624996babab9 Merge: 69918629f 6ad2c2b92 Author: Nick Mathewson Date: Mon Jul 9 10:17:20 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_entrynodes.c | 6 ++ 1 file changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 69918629f56ee61ff6c538ea53caefefbabf84f6 Merge: 532873a92 4a604d993 Author: Nick Mathewson Date: Mon Jul 9 10:14:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26269 | 5 + src/or/router.c | 15 +-- 2 files changed, 14 insertions(+), 6

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 451a84cecb4bc98fd2ac86aeff1c10c1cac0fd79 Merge: fead22fb2 d3894dc34 Author: Nick Mathewson Date: Mon Jul 9 09:11:41 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-07-03 |4 + src/config/geoip | 7171

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 4c094436c50a489d2ecdd09b8dfb7dc9a3c97389 Merge: 9aeef05f8 a4e8f9450 Author: Nick Mathewson Date: Tue Jul 3 09:48:03 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26535.029| 5 + changes/bug26535.032| 5 + src/test/hs_ntor_ref.py | 7 +--

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 72ee0b6f793949c4637c5878c51a39316f0b336e Merge: 36c372581 3c97b148a Author: Nick Mathewson Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 scripts/maint/checkSpace.pl | 5 - 1 file changed, 5 deletions(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 36c372581f8d7651c336f69b9b1b051d3d31d548 Merge: 92b4996b2 ed84dab8b Author: Nick Mathewson Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_channelpadding.c | 1 + src/test/test_hs_descriptor.c | 3 +++ src/test/test_shared_random.c

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 92b4996b233a6a5d034b4ecc47b9f97985bb5886 Merge: f82f8179e 6e9d5fc4e Author: Nick Mathewson Date: Fri Jun 29 13:07:13 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/hs_client.c| 6 +++--- src/test/test_hs_common.c | 7 ++-

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit f82f8179e65c5e0021da46fd24e4bd7d8126d8f7 Merge: df896ed63 68dfbd5ef Author: Nick Mathewson Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26467| 3 +++ src/or/directory.c | 1 + src/or/hs_descriptor.c

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit df896ed6323f6f0493393f97e739501df8092e7f Merge: f8dad5a07 fe2588a5a Author: Nick Mathewson Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c| 7

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit f8dad5a079ac356ef72f14cfddca2d81fd824102 Merge: 8b108935b 25226fb26 Author: Nick Mathewson Date: Tue Jun 26 09:21:59 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/feature26372_029 | 4 configure.ac | 6 +- 2 files changed, 9 insertions(+), 1

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9 Merge: ccf1eb316 6107a2127 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 049ba66746006e45d8033d8f88f97ba61d8c5631 Merge: 1c80eb92f 6017447e3 Author: Nick Mathewson Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 5 + src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit ca6d289c00e5e18b24c7f463e709125e545d4405 Merge: 049ba6674 7e7585d0a Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 1c80eb92fa6c5240b1029c5ee1febe2d20b7d882 Merge: 5f39b ff70cc84f Author: Nick Mathewson Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c | 8

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit eaa359650cd4654744f8750ee6a59d8653e96147 Merge: f2e7570c7 53513e4bf Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 7fff99110b6d00dbd438ce9182474f045f996f3f Merge: 6dca180ae 5d8a927aa Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 6dca180ae9abcd5bd12c6aa4dda8d3e19017a6cb Merge: a14112743 74ac463e7 Author: Nick Mathewson Date: Tue Jun 12 08:11:20 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-06-07 |4 + src/config/geoip | 5848

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit a141127435383840e48e6a06efbfc85eefaf06a8 Merge: f15f90e2c dd63033fc Author: Nick Mathewson Date: Fri Jun 8 10:12:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26196 | 4 src/or/protover.c | 13 + 2 files changed, 17 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 0ef432d4577790b36bd7945c51382271ce0d2105 Merge: c000763f1 3f3739c6e Author: Nick Mathewson Date: Thu May 24 09:40:06 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_crypto.c | 41 + 1 file changed,

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 3c4353179f2304767f5084734a7d1550f51f4542 Merge: 6acbd4c11 8340f641c Author: Nick Mathewson Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26072 | 5 + src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 6acbd4c112d984c8a3fcfa1a387093131b740ca7 Merge: b343ba906 4aa3d511b Author: Nick Mathewson Date: Tue May 15 09:32:44 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-05-01 |4 + src/config/geoip | 5455

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit b343ba90604de524b5fa7d87a6daf76fcc118adb Merge: f64fa6b19 7ee67c47f Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit f64fa6b19ec7663f47e600599761fadbde4135e9 Merge: 59812789f 15b8c860d Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 59812789f7b16647762a7a79fc6db381e945a701 Merge: abde29824 e5acbbd16 Author: Nick Mathewson Date: Thu May 10 08:03:04 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26062| 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit abde29824ceb76bd21e728260796ecb4ff55151a Merge: a639a6784 394f102ea Author: Nick Mathewson Date: Wed May 9 11:53:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 - src/or/rendservice.c | 5

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 4c6a407b9d9436948dbbecffde32e28380240728 Merge: 44626b37f be5b4415c Author: Nick Mathewson <ni...@torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 _______ tor-commits mailing list tor-c

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit c66b512671cf1711c7325db664335f1694bb3109 Merge: b116710e3 246765342 Author: Nick Mathewson Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26007 | 5 + src/or/dirserv.c | 13 +++-- 2 files changed, 16

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 58f54a3588cf722a31b10fa0450225f7685c8629 Merge: 85cd8386f 7c3f87eb4 Author: Nick Mathewson Date: Wed Apr 25 08:01:54 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 85cd8386fa7da82d453bfb31b39184fbd8d96e08 Merge: d44753b0e 89a3fafd4 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 _______ tor-commits mailing list tor-c

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 7e7b052b2a114900b5e6575fd5375dc00c09d5db Merge: 6182f60f7 9187cdb1c Author: Nick Mathewson Date: Tue Apr 24 10:37:36 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25901| 3 +++ src/or/hs_service.c | 4 2 files changed, 7

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 6182f60f758f85a214a7e84d76f6fddb2bffd730 Merge: e8683bcbb d2951b381 Author: Nick Mathewson Date: Tue Apr 24 08:51:55 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug23693.1 | 4 src/or/config.c| 12 ++-- src/or/main.c

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit e8683bcbb19318fcd9df04464296d6581adc959d Merge: cb813a352 1438c6c71 Author: Nick Mathewson Date: Mon Apr 23 09:24:33 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b Merge: 93ff1870b f0230ee38 Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 9ef4c05df8323850b5894782f435da15810d6189 Merge: 22845df2a c5899d5cf Author: Nick Mathewson Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 0b1a054d68f4ebb760add6d3a1bda75fb8b17553 Merge: 306563ac6 d3ac47b41 Author: Nick Mathewson Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 12fc4206f28576d872033b8a99756252e5354662 Merge: 2dee38fba 124e06e85 Author: Nick Mathewson Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2 files

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 2dee38fba0193c952500b9d0227ebcff6d5432d6 Merge: 78bf56416 df519e5de Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 78bf56416868ed6de53af63d49c6d8555150f856 Merge: ac3e389db 9b10eb2d7 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit da5173c83148b4b437488571c2f6e88dc2e175eb Merge: 46c2b0ca2 0b795ce6d Author: Nick Mathewson <ni...@torproject.org> Date: Tue Mar 27 18:25:31 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 _______ tor-commits mailing list tor-c

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 33606405e3070de6517690b1494f16c04524ce72 Merge: eacfd2911 b5a6c0399 Author: Nick Mathewson Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/feature25313 | 4 src/common/sandbox.c | 23 ++- 2

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 910422e8fae173f061d016c72eecc2015a09537e Merge: 85719b79b 66d312063 Author: Nick Mathewson Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 85719b79b71eb5a4ef889272a393aa97bbc86134 Merge: 9d1c7c3a8 bc0de600b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .travis.yml | 24 1 file changed, 20 insertions(+), 4

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 296e429ebcb676b39a574bf8e8850c53bb659d74 Merge: f0f2fab5e a0cc7e949 Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++-

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 6bc324c96abd463c4a386e81bd71b594ac59fed7 Merge: 950606dcc d60dc2755 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 _______ tor-commits mailing list tor-c

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 950606dcc947fee4a7196bce0bab1595164fbab0 Merge: 676a28599 38b7885c9 Author: Nick Mathewson Date: Tue Mar 13 10:58:03 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 676a28599dcc3854a98c684808055db76dcd265b Merge: e9dbd6dd8 094294dbb Author: Nick Mathewson Date: Tue Mar 13 13:41:24 2018 +0100 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25474 | 5 + configure.ac | 3 ++- 2 files changed, 7 insertions(+),

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 35d945a646b3384640d3863aec07d873179efffd Merge: 15f6201a5 0026d1a67 Author: Nick Mathewson Date: Sat Mar 3 11:33:33 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" merge to avoid version bump.

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit f7eff2f8c53dacb7c375bbe6bc9cced95103307d Merge: d489e4847 d01abb934 Author: Nick Mathewson Date: Thu Mar 1 16:10:43 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25249 | 3 + changes/bug25249.2 | 3 +

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit e0903ebd88a47a03a5e432e1a6c98452ae8a9008 Merge: f7eff2f8c 1ec386561 Author: Nick Mathewson Date: Thu Mar 1 16:43:42 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" to avoid version bump. ___

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 8a5cb58ad0b8e553d9df24aca02b0f8af5c0d47c Merge: 6384d314f bcfb03495 Author: Nick Mathewson Date: Wed Feb 21 11:53:50 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 .gitmodules | 2 +- changes/ticket25323 | 4 2 files changed, 5

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 6384d314fb47a088299a14b52e5f60b6e79697b4 Merge: 9f1899fdf bd71e0a0c Author: Nick Mathewson Date: Fri Feb 16 09:55:41 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 "ours" merge to avoid taking 24902 a second time and having to reconcile all

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 8970058af6822b14bc06e7a98230b8b13c0084a9 Merge: d662d4470 c8b087d90 Author: Nick Mathewson Date: Fri Feb 16 08:47:41 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24898-029 | 6 ++ 1 file changed, 6 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 9f1899fdfd611861bd1a254a6ba6df4ddf05f5da Merge: 8970058af c67adddac Author: Nick Mathewson Date: Fri Feb 16 08:49:08 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24898-029 | 6 -- 1 file changed, 6 deletions(-)