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

commit bf2ffd39781664b6b29a57a1dd1d110368f120ce Merge: 04b5b8709 5b04392c1 Author: Nick Mathewson Date: Fri Sep 21 09:35:23 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug27316 | 3 +++ src/or/protover.c| 15 +++ src/test/test_protover.c

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

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

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

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

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

commit 0bef3a21cc749550e47dfeaadb9843e91567e841 Merge: 0dcf29793 5a8827a4c Author: Nick Mathewson Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 22 ++ changes/ticket27252 | 6 ++

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

commit 0dcf29793c8889c698adc47ba6ac50522b97e6d7 Merge: 544f73d25 3119cb506 Author: Nick Mathewson Date: Tue Sep 11 12:04:56 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/geoip-2018-09-06 | 4 + src/config/geoip | 49324

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

commit 544f73d25f309bbf034119429775d3ac22c027c2 Merge: a15075721 8408331b3 Author: Nick Mathewson Date: Mon Sep 10 09:42:57 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit 92a88fede564dbc723ab77d952f89d3fac7bc430 Merge: f869cd012 36885f34f Author: Nick Mathewson Date: Fri Sep 7 15:13:34 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 54e2a3315a94b86454b687600bb02ada96b3699c Merge: 22414c050 a5bbe3f1d Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 253 ++- changes/bug26497

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

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

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

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

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

commit 91d999e17e0f6787bead391cbe03c0beda069656 Merge: 8683c5653 db3414dd5 Author: Nick Mathewson Date: Thu Aug 16 08:34:23 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 doc/HACKING/GettingStartedRust.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-)

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

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

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

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

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

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

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

commit 920a7b37a5d05266c705a34965cbd0fb29e4da66 Merge: edfa74688 4856a6e6c Author: Nick Mathewson Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug20424_029_minimal | 4 configure.ac | 4 2 files changed, 8

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 4d052b611bc3fdc9f50042cbb6be3578bab5ed7a Merge: 8a49a4411 559f79fd7 Author: Nick Mathewson Date: Wed Jul 18 15:03:35 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26485| 4 src/or/config.c | 9 - src/or/dirserv.c| 43

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 855b27b9e76aadb8b771e1aaf350f676df797a56 Merge: 71bcba470 3c97b148a Author: Nick Mathewson Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 scripts/maint/checkSpace.pl | 5 - 1 file changed, 5 deletions(-)

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

commit 71bcba4704bbf20bf4676e35a0c3cfa9b8bc4df6 Merge: fcfe16197 ed84dab8b Author: Nick Mathewson Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_channelpadding.c | 1 + src/test/test_hs_descriptor.c | 3 +++ src/test/test_shared_random.c

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 2e3dce604ec8de261763bc49e5117952ab19c93c Merge: c62ab5417 ff70cc84f Author: Nick Mathewson Date: Wed Jun 13 09:57:10 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25686_diagnostic | 4 src/or/directory.c | 5 +++-- src/or/router.c |

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

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

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

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

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

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

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

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

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

commit 432620e44ed15364bf5404e0ad052f6c114a88aa Merge: f3b53391e 3f3739c6e Author: Nick Mathewson Date: Thu May 24 09:40:06 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26116 | 7 +++ src/common/crypto.c| 7 ++-

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

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

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

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

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

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

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

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

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

commit a15009bd38cfc7ef9a426c25d40d2c7a8c6a2a80 Merge: 7e1102ff2 e5acbbd16 Author: Nick Mathewson Date: Thu May 10 08:20:38 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket26062| 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3

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

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

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

commit a1243864f263fdf9bc815ab31fa785f84d1b4b8d Merge: 4b14ff45f be5b4415c Author: Nick Mathewson Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 4 +++- Makefile.am | 9 + 2 files changed, 12 insertions(+), 1

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

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

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

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

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

commit 7a55efbd597ccc32f61234ad45abc96aa73521e4 Merge: 31e69ac22 89a3fafd4 Author: Nick Mathewson Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 5 - changes/travis_distcheck | 4 2 files

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

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

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

commit 3abd57fa0a59bd32b6e595870a7afad3a453dc18 Merge: ecb51bf9f d2951b381 Author: Nick Mathewson Date: Tue Apr 24 08:49:24 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23693.1 | 4 src/or/config.c| 10 +- src/or/main.c

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

commit ecb51bf9f347ac7c1cf5b716543e0f79f0c50100 Merge: 65fd97375 1438c6c71 Author: Nick Mathewson Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6

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

commit 65fd973754592bb279e1b66ce226eb3e8362b815 Merge: 677789b68 f0230ee38 Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11

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

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

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

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

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

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

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

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

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

commit 70bd4aae670bf48af0b83a3b14b2d841244b7e92 Merge: 6170f87e0 9b10eb2d7 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253

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

commit 6170f87e01cc0d5f341c6a74ecb07f7f8838e6a5 Merge: 7dbaaba3d 0b795ce6d Author: Nick Mathewson Date: Tue Mar 27 18:25:21 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25629 | 3 +++ src/or/nodelist.c | 28 ++-- 2

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

commit 7dbaaba3d2912a695d6c8cfaa22d6880d7211e32 Merge: 109c555e9 b5a6c0399 Author: Nick Mathewson Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/feature25313 | 4 src/common/sandbox.c | 23 ++- 2

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

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

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

commit 36154c13f41f517c7629613d4b58cde23bb9ee1a Merge: 75b544d64 bc0de600b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 24 1 file changed, 20 insertions(+), 4

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

commit 75b544d64da0e273090d2f7ff98a67c9267cc37d Merge: 2f397236b a0cc7e949 Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++-

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

commit 2f397236b21a30899c7334b509200744a2a74987 Merge: 4b067f8b1 d60dc2755 Author: Nick Mathewson <ni...@torproject.org> Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

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

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

commit 4a03851e42afcb75525b4c4ca2331e75fb19fadf Merge: 2d42648ea 094294dbb Author: Nick Mathewson Date: Tue Mar 13 13:42:06 2018 +0100 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25474 | 5 + configure.ac | 3 ++- 2 files changed, 7

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

commit 2d42648eaf0bfbf66957a427ff503d5d47d03bc5 Merge: 31cc63deb 0026d1a67 Author: Nick Mathewson Date: Sat Mar 3 11:34:10 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit bc8b5fb559be9044c7c32e7cdadbe02795b85e60 Merge: 43d44c04f d01abb934 Author: Nick Mathewson Date: Thu Mar 1 16:07:59 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25249 | 3 + changes/bug25249.2 | 3 +

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

commit a9769b78f082b29d4b8a16f0f0a2f5d813656f6c Merge: 499bdd81a 1ec386561 Author: Nick Mathewson Date: Thu Mar 1 16:44:31 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

commit 1c561819832883b869554614de90e3d13ef120a0 Merge: 434942ea5 bcfb03495 Author: Nick Mathewson Date: Wed Feb 21 11:53:50 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 .gitmodules | 2 +- changes/ticket25323 | 4 2 files changed, 5

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

commit 434942ea59914eca2ac8e973ff021eaf439bde8f Merge: cc1792264 bd71e0a0c Author: Nick Mathewson Date: Fri Feb 16 09:55:59 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24952| 5 + changes/bug25223| 4 +

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

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

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

commit cc17922645ff9224d70ab8c6e5f53bc705119267 Merge: 7e664bf74 c67adddac Author: Nick Mathewson Date: Fri Feb 16 08:49:08 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24898-029 | 6 -- 1 file changed, 6 deletions(-)

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

commit 4bfbce9de7ac84259e8c27939cace2952e98d0e6 Merge: 6a35e7d69 cb9a322b6 Author: Nick Mathewson Date: Tue Feb 13 16:55:19 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug21074_downgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 6a35e7d69abfc7394bb673a2e3c338cc4ee2c1dd Merge: 3fda19ef2 b062730a1 Author: Nick Mathewson Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket25170 | 5 + src/or/dirserv.c| 10 -- 2 files changed,

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

commit 3fda19ef24a47b342d77e9a6167a11e9a4792165 Merge: 1a877693d 021c3bd58 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Feb 12 08:33:48 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit 1a877693da774acea626acb4349a80010b058563 Merge: 2a24ce965 98fc8cd93 Author: Nick Mathewson <ni...@torproject.org> Date: Sun Feb 11 18:11:04 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit 2a24ce9656cc36283b615b0da9e64c16adf36374 Merge: 9e81221c9 67043d957 Author: Nick Mathewson <ni...@torproject.org> Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 _______ tor-commits mailing list tor-c

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

commit 9e81221c96793adfe3c46979ae4f749ff26e3644 Merge: cb3c1f2e5 684d57fe8 Author: Nick Mathewson Date: Sun Feb 11 17:01:00 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug21074_downgrade | 4 src/common/compat.c| 14 +++---

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

commit cb3c1f2e541c89789faa811be0a43b3288a4594c Merge: 67127dca5 4de20d175 Author: Nick Mathewson Date: Sat Feb 10 16:09:01 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24978 | 7 +++ src/common/ciphers.inc | 21

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

commit 67127dca57fe63a9ded02db1e63dfbe166ca36d0 Merge: f5e37b2eb 84bc75b2e Author: Nick Mathewson Date: Thu Feb 8 10:29:06 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/geoip-2018-02-07 | 4 + src/config/geoip | 34364

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

commit f5e37b2eb6b33185a30a2aadd513c7e4dfbc1379 Merge: 90716e3f9 4ceae7c6b Author: Nick Mathewson Date: Fri Feb 2 12:03:54 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/scheduler.c| 26 +++--- src/test/test_scheduler.c |

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

commit 90716e3f9ce3d5316d6d38323e2cc7c3125b576f Merge: 1a4876587 77634795b Author: Nick Mathewson Date: Thu Feb 1 16:58:03 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24700| 4 src/or/channel.c| 3 +++

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

commit 1a4876587eb351d51208c5dd93aa37a1e021b8cf Merge: df37b9333 31542cc30 Author: Nick Mathewson Date: Thu Feb 1 15:28:17 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25070 | 3 +++ src/or/protover.c | 2 +- 2 files changed, 4 insertions(+),

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

commit df37b933363cc720a24d1ce5ac70a576480abb25 Merge: a877241e6 61cb2993d Author: Nick Mathewson Date: Thu Feb 1 08:15:18 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24975 | 2 +- src/or/networkstatus.c| 36

  1   2   3   >