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

commit b489e8cfeaaf4d66f048e51453873a0357dd2ba3 Merge: b22b60365 4c094436c Author: Nick Mathewson Date: Tue Jul 3 09:48:03 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26535.029| 5 + changes/bug26535.032| 5 + src/test/hs_ntor_ref.py | 7 +-- sr

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

commit b22b60365f2d7db2db31128fa733c67d6f52fb8c Merge: 103076a75 9aeef05f8 Author: Nick Mathewson Date: Sun Jul 1 10:22:20 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26523 | 5 + src/or/control.c | 13 + 2 files changed, 14 insertions(+), 4 deleti

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

commit 103076a75933dd6410e5742fa268f36b0d021e13 Merge: a814ed019 72ee0b6f7 Author: Nick Mathewson Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 scripts/maint/checkSpace.pl | 5 - 1 file changed, 5 deletions(-) _

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

commit a814ed0192d9f11182c996d5833ea5543e6326b3 Merge: 739cd6ec2 36c372581 Author: Nick Mathewson Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.3' into release-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/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

commit 739cd6ec209742390b612ad881ed0e22e8d5e96b Merge: 97dfe87be 92b4996b2 Author: Nick Mathewson Date: Fri Jun 29 13:07:13 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/hs_client.c| 6 +++--- src/test/test_hs_common.c | 7 ++- src/test/test_hs_introp

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

commit 97dfe87be0b2e0aa3fd8db3926d9b66ec2373a01 Merge: 0f85e059b f82f8179e Author: Nick Mathewson Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket26467| 3 +++ src/or/directory.c | 1 + src/or/hs_descriptor.c

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

commit 0f85e059b7e90cdfdb9b130b811e552107fdee38 Merge: 63cddead3 df896ed63 Author: Nick Mathewson Date: Fri Jun 29 13:00:56 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/routerlist.c | 2 ++ src/or/shared_random_state.c | 1 + src/test/test_hs.c| 7

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

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

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

commit 6c38795b7ef0dbe88f188b60e65d6b850946374c Merge: 156e9723b 8b108935b Author: Nick Mathewson Date: Thu Jun 21 08:54:02 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 156e9723bfda28b9cddbc081e80adc75a4c3423e Merge: 8a6e2d5da 7b1a3c516 Author: Nick Mathewson Date: Thu Jun 21 08:36:48 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26435 | 5 + src/or/protover.c | 9 ++--- 2 files changed, 11 insertions(+), 3 deletions

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

commit 8a6e2d5da529564fe61e2841be1b497b0432ca1f Merge: c134ccfac a360bf287 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

commit c134ccfac63682914c9d317acd4cea99602ce951 Merge: 6ea38c4b5 ccf1eb316 Author: Nick Mathewson Date: Sat Jun 16 13:10:19 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

commit 6ea38c4b55d2624979f281701e4d74add6438396 Merge: 8e9996752 71065201d Author: Nick Mathewson Date: Thu Jun 14 12:50:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26258_033 | 4 src/test/include.am | 1 + src/test/test_rust.sh | 23 ++

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

commit 8e99967521b3da49b991d08f19b20a1e4e969490 Merge: c7d2671f7 ca6d289c0 Author: Nick Mathewson Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

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

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

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

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

commit bc5d904237d3431163ae463488efbc063292e408 Merge: 035a35178 5f39b Author: Nick Mathewson Date: Tue Jun 12 12:05:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

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

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

commit ef0b19aec68bf48018f4c833778bc9b966ab9a25 Merge: 7b7b817c3 f2e7570c7 Author: Nick Mathewson Date: Tue Jun 12 08:57:37 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit 9ff769c4921f77bff0e0b7b76c53d4e5b1af7659 Merge: 3cca9a103 7fff99110 Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+) ___

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

commit 3cca9a103d8d1e6afa520ce45b9e08f4f5a0d987 Merge: 79c56a6e3 6dca180ae Author: Nick Mathewson Date: Tue Jun 12 08:11:20 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/geoip-2018-06-07 |4 + src/config/geoip | 5848 +

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

commit 79c56a6e312508b6ff44777ea20667cc475955aa Merge: 0c9d61776 a14112743 Author: Nick Mathewson Date: Fri Jun 8 10:12:57 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26196 | 4 src/or/protover.c | 13 + 2 files changed, 17 insertions(+) ___

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

commit 0c9d6177628059f089e8792255b4b16b0caaa857 Merge: db9ca07c4 f15f90e2c Author: Nick Mathewson Date: Sat Jun 2 10:42:06 2018 -0700 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26121 | 6 ++ src/or/circuitstats.c | 15 +++ 2 files changed, 17 insertions

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

commit db9ca07c46bbdf5ad63d03c6b1401a6e5c83770e Merge: c8dad0492 fa1890e97 Author: Nick Mathewson Date: Sun May 27 10:04:42 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25691_again| 6 + src/or/circuitbuild.c | 67 ---

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

commit c8dad049249b3a93f289caf1d1ace546e19699af Merge: c11c851b3 0ef432d45 Author: Nick Mathewson Date: Thu May 24 09:40:06 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26116| 7 +++ src/common/crypto_rsa.c | 2 +- src/test/test_crypto.c | 41

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

commit c11c851b390283271b2de6dd2cfd1512c9faa342 Merge: 7dd0813e7 ff27b7ce6 Author: Nick Mathewson Date: Tue May 22 18:05:55 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit 67da2d94119aaf7c843f88ff63302f7ff52218bf Merge: 025670236 80d673cce Author: Nick Mathewson Date: Tue May 22 14:13:28 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

commit 0256702362b76345401156fa5258b686b53fe28e Merge: 20f8fead9 a5d4ce2b3 Author: Nick Mathewson Date: Tue May 22 13:35:33 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/protover_rust.c | 17 - src/rust/protover/ffi.rs | 26 ++ s

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

commit 20f8fead9c27c0de7a5913f53294e960b029749b Merge: 0b8de7b3c 6e8e005b5 Author: Nick Mathewson Date: Tue May 22 12:54:31 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

commit 0b8de7b3c3b62fe553b8e5c75d2f85ab22628e01 Merge: b6a88173b 074b182ba Author: Nick Mathewson Date: Tue May 22 12:40:27 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit f177ec21424ea50b289acca38ce39b2c8ea401c6 Merge: 2b2634339 569b4e57e Author: Nick Mathewson Date: Tue May 22 12:33:54 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/TROVE-2018-005| 6 +++ src/or/dirserv.c | 6 +++ src/or/protover.c

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

commit c91c4e9bb69113feee91f0056ca9aea7adc538fd Merge: f15e1e65c 3d1266324 Author: Nick Mathewson Date: Tue May 22 08:35:41 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25415 | 4 src/or/dirserv.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) __

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

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

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

commit ca63a66604d4238c1b289627c2137d500f0c86ef Merge: 111853614 6acbd4c11 Author: Nick Mathewson Date: Tue May 15 09:32:45 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/geoip-2018-05-01 |4 + src/config/geoip | 5455 ++---

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

commit 1118536142d03ab3e3958788c9bedd354b9fc8fa Merge: f36fea697 b343ba906 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6 insertions(+), 1 deletio

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

commit f36fea697eb480d9e67cfbd69b122427802fea85 Merge: 62b224f72 f64fa6b19 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_dir.c | 20 1 file changed, 20 insertions(+) ___

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

commit 62b224f724568459b9ab2984b196c6d15046bf29 Merge: ff46d08fd 59812789f Author: Nick Mathewson Date: Thu May 10 08:20:38 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket26062| 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-

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

commit ff46d08fd4f1fd6a93fd878e1b4b18f610b53132 Merge: 582f78454 abde29824 Author: Nick Mathewson Date: Wed May 9 11:53:18 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 - src/or/rendservice.c | 5 +++-- 3 files changed

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

commit 582f784548747bac228d5e5d327d7e7ca039ece5 Merge: 6db0c006b a639a6784 Author: Nick Mathewson Date: Wed May 9 08:26:08 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket26006 | 4 src/common/compat_openssl.h | 6 +- src/test/test_tortls.c | 3

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

commit 6db0c006b2d4d1244f9e4fa486ff7ad66a7ccb47 Merge: 0e4f7b56a b979415e8 Author: Roger Dingledine Date: Tue May 8 13:49:34 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26052 | 6 ++ doc/tor.1.txt| 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

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

commit 0e4f7b56a2da9583ee4749b7477655a01265715b Merge: 40456054e 46002aa69 Author: Nick Mathewson Date: Mon May 7 13:33:19 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25733 | 4 src/or/circuitstats.c | 20 ++-- 2 files changed, 22 inserti

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

commit 40456054eadf8a002de66d25cdf1400764a9f8af Merge: f6890422a 4c6a407b9 Author: Nick Mathewson Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 4 +++- Makefile.am | 8 2 files changed, 11 insertions(+), 1 deletion(-) ___

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

commit f6890422aa954ea2dd23bc4bc55f5716e88dcd7e Merge: 8e81d329e 1bbe75da6 Author: Nick Mathewson Date: Thu May 3 13:37:37 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 doc/tor.1.txt | 35 ++- 1 file changed, 22 insertions(+), 13 deletions(-) __

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

commit 8e81d329eec224022de8f8d0318ebb60a18265f9 Merge: 3a53b0c9a c66b51267 Author: Nick Mathewson Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26007 | 5 + src/or/dirserv.c | 13 +++-- 2 files changed, 16 insertions(+), 2 deleti

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

commit 3a53b0c9a2eda2f5c7ca57675051f6d8bdefe5d0 Merge: 19bed6f93 b116710e3 Author: Nick Mathewson Date: Fri Apr 27 13:26:17 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 2 -- 1 file changed, 2 deletions(-) ___ tor-comm

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

commit 19bed6f936350dc024c82bd11d624c34063d9172 Merge: 148540c50 58f54a358 Author: Nick Mathewson Date: Wed Apr 25 08:01:54 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _

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

commit 148540c505bfcdf6680df8fc20de5362b0666298 Merge: d8114a1f5 85cd8386f Author: Nick Mathewson Date: Tue Apr 24 10:38:37 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 7 ++- changes/travis_distcheck | 4 2 files changed, 10 insertions(+),

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

commit d8114a1f572f01559b149dff53d380bdad6f29c0 Merge: 08fca9414 7e7b052b2 Author: Nick Mathewson Date: Tue Apr 24 10:37:36 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25901| 3 +++ src/or/hs_service.c | 4 2 files changed, 7 insertions(+) ___

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

commit 08fca9414d22a2a0c363e1249b1a0b2908fe10eb Merge: 5807656f8 6182f60f7 Author: Nick Mathewson Date: Tue Apr 24 08:51:58 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug23693.1 | 4 src/or/config.c| 12 ++-- src/or/main.c | 2 +- src/or/route

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

commit 5807656f8f0f0d39e712b104d80790570dee87fa Merge: 84ff77689 e8683bcbb Author: Nick Mathewson Date: Mon Apr 23 09:24:33 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+) __

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

commit 84ff776893d248d2fdf5e1f21f765ff58a93403f Merge: d8a9c9f2c cb813a352 Author: Nick Mathewson Date: Fri Apr 20 14:39:48 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/25857 | 3 +++ doc/tor.1.txt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ___

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

commit d8a9c9f2c870bb95c9247f42ae23f727af7d36de Merge: fb3591874 44aa586de Author: Nick Mathewson Date: Tue Apr 17 10:48:18 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 9 - changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-)

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

commit fb35918747493b518b62542899ed99cd8a3f0548 Merge: 6c4e10c93 93ff1870b Author: Nick Mathewson Date: Tue Apr 17 10:45:58 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/dos.c | 15 +-- src/or/relay.c | 4 src/or/relay.h | 1 +

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

commit 6c4e10c9360702cf6aa851c8d0d2a361623bc285 Merge: 8ae9ed628 9ef4c05df Author: Nick Mathewson Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 8ae9ed6287649a67a1cef5636a8042dfa6a341c0 Merge: d17ddb839 22845df2a Author: Nick Mathewson Date: Mon Apr 16 10:06:21 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25226 | 4 +++ src/or/networkstatus.c | 1 + src/or/or.h| 6 - src/or/re

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

commit d17ddb8393b206748d19e3717f41146dbdd245d9 Merge: 81d71f0d4 3ee4c9b1f Author: Nick Mathewson Date: Sun Apr 15 15:41:24 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit 74882c781c46bf1781c65cd629c41eea191678db Merge: f95f6a449 b65024f57 Author: Nick Mathewson Date: Sat Apr 14 12:22:00 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit f95f6a44982bd8130a840b564501ed8d87e92bb6 Merge: 50406c272 4d8de6c6b Author: Nick Mathewson Date: Fri Apr 13 13:09:15 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket25248 | 4 + doc/tor.1.txt | 225 ++--

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

commit 50406c272024be63047576a19a8159bd25239164 Merge: 6963aca6a 2d6914e39 Author: Nick Mathewson Date: Fri Apr 13 13:05:53 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25691 | 6 ++ src/or/circuitbuild.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion

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

commit 6963aca6ac04205df923b3c3da9d00b8133ad32b Merge: be3d8cb17 46795a7be Author: Nick Mathewson Date: Thu Apr 12 12:31:41 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_config.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) _

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

commit be3d8cb1762d24e4ed87e7f26df53b1e564e6aac Merge: 85db0c46e 4aaa4215e Author: Nick Mathewson Date: Thu Apr 12 12:25:51 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/config.c | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) ___

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

commit 85db0c46eb522c1ae2974306694cb35002ba62a2 Merge: 572077b7f 31508a0ab Author: Nick Mathewson Date: Thu Apr 12 11:14:42 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24782 | 4 +++ src/common/compat.c| 4 +-- src/common/compat.h| 2 +- src/or/con

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

commit 572077b7fd4897174230faccb15abdb2c0b4450c Merge: 6a0b31e5a 0803d79f5 Author: Nick Mathewson Date: Wed Apr 11 15:38:00 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25581 | 4 doc/tor.1.txt| 20 ++-- src/or/config.c | 7 +-- 3 fil

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

commit 6a0b31e5a7db0271c90ef4eb11a14e16a3843d70 Merge: 3230814d2 f9ba0c654 Author: Nick Mathewson Date: Wed Apr 11 10:48:46 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24989| 4 src/or/circuituse.c | 2 +- src/or/or.h | 8 3 files changed,

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

commit 3230814d2ba0b213e1eba645a7a610fd28e31a11 Merge: f46777163 0b1a054d6 Author: Nick Mathewson Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 + src/or/config.c

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

commit f467771634299c3733480cacc6d9059cbd8abf45 Merge: 98a049849 306563ac6 Author: Nick Mathewson Date: Fri Apr 6 16:18:47 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25732| 4 src/rust/include.am | 5 - 2 files changed, 8 insertions(+), 1 deletion(-)

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

commit 98a04984901585ed1a31032cc58d6dc3bd5dd415 Merge: ad0bc6e54 12fc4206f Author: Nick Mathewson Date: Thu Apr 5 12:09:00 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25296_032 | 5 + doc/tor.1.txt| 12 ++-- 2 files changed, 11 insertions(+), 6

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

commit ad0bc6e54c906e3c9e44a25d7675954b88775535 Merge: 876b4b168 2dee38fba Author: Nick Mathewson Date: Thu Apr 5 08:36:13 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 4 ++-- changes/ticket25714 | 4 2 files changed, 6 insertions(+), 2 deletions(-)

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

commit 876b4b168ac9552de392d9c8275754f560d5bb32 Merge: 8a8b4ae69 78bf56416 Author: Nick Mathewson Date: Thu Apr 5 08:22:34 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253 ++--

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

commit 8a8b4ae69b4f8a28afcc245f98c11b34165ddaaf Merge: 01037c106 ac3e389db Author: Nick Mathewson Date: Thu Apr 5 08:21:43 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25582 | 3 +++ changes/bug25679 | 4 configure.ac | 12 ++-- doc/tor.1.txt|

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

commit 01037c106d3a00614646db0d45a07a925121a07f Merge: 753840a8a ec8ee5412 Author: Nick Mathewson Date: Wed Apr 4 08:57:24 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug21394.2 | 7 +++ src/or/dns.c | 19 +++ 2 files changed, 18 insertions(

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

commit 753840a8a7c946dbf2188cb4f8b03b8ff7cfbe61 Merge: 5bdc18b2d 7ccb1c5a8 Author: Nick Mathewson Date: Tue Apr 3 19:03:38 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24031| 13 + src/or/protover.c | 77 ++- src/rust/protov

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

commit 5bdc18b2df68804efa47aa6085de81085686e631 Merge: e47080a4d 961d2ad59 Author: Nick Mathewson Date: Mon Apr 2 08:51:47 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug22310 | 8 src/or/dirserv.c | 1 + 2 files changed, 9 insertions(+)

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

commit e47080a4d7e8f532e2278ddf75c7a144a6596b84 Merge: 720f044a2 6aaafb067 Author: Nick Mathewson Date: Thu Mar 29 15:00:46 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 doc/tor.1.txt | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) _

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

commit 720f044a29d60088fedb8f915cffee1259395eba Merge: 2f173ce44 4f473fadb Author: Nick Mathewson Date: Thu Mar 29 14:59:01 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25617 | 5 + src/or/dnsserv.c | 1 + 2 files changed, 6 insertions(+) __

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

commit 2f173ce44237a3917ad1d214e3e1fceb680e4c7f Merge: a204a919f 2e9e91ebb Author: Nick Mathewson Date: Thu Mar 29 11:24:22 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit 36d1250a0193ccc7e9070106693f7f9c2799cab4 Merge: 2504c2d4a 3fa66f979 Author: Nick Mathewson Date: Thu Mar 29 08:01:55 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

commit 2504c2d4ae5b5f37be35b95c20dc0ee40dd3c3cd Merge: e31487b4e e0bbef48b Author: Nick Mathewson Date: Wed Mar 28 14:23:06 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24767 | 5 + src/or/connection_or.c | 225 +++

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

commit e31487b4edde5e2e45491f5c32c421acd133ada6 Merge: 08cd7a1bf 3cc382b93 Author: Nick Mathewson Date: Wed Mar 28 08:11:46 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25664 | 3 +++ configure.ac | 2 +- doc/HACKING/GettingStar

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

commit 08cd7a1bf29596aa51290ed00cd21d9247daabef Merge: f2027d5bf d416e208e Author: Nick Mathewson Date: Wed Mar 28 07:50:47 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bugs_25036_25055 | 7 + src/common/util.c| 72 ++---

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

commit f2027d5bf8bc70738b14d50e7a694dfd1a47d69a Merge: d5580d9a2 ddee28a3c Author: Nick Mathewson Date: Tue Mar 27 18:25:52 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25629 | 3 +++ src/or/nodelist.c | 28 ++-- 2 files changed, 17 inserti

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

commit d5580d9a2778ac399aa6db44ad602cf02e7c1dbe Merge: 1f3e0f157 46c2b0ca2 Author: Nick Mathewson Date: Tue Mar 27 07:05:15 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25213 | 5 + src/or/circuitbuild.c | 14 -- src/test/test_hs_serv

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

commit 1f3e0f157cbd7c71f8f8505e3f0ee3cc07ead629 Merge: 08cc2cc69 841ed9dbb Author: Nick Mathewson Date: Mon Mar 26 19:47:48 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24904 | 4 src/or/channel.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

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

commit 08cc2cc692ac12c64dff992d68ffde55c7b95202 Merge: 7ebb1ba2c ca2d9cbb9 Author: Nick Mathewson Date: Mon Mar 26 10:32:53 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24903 | 5 + src/or/control.c | 3 +++ 2 files changed, 8 insertions(+)

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

commit 7ebb1ba2c3da9ced5f586a1fd4ddc397ff611f22 Merge: a4190d44f 33606405e Author: Nick Mathewson Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/feature25313 | 4 src/common/sandbox.c | 23 ++- 2 files changed, 6 insert

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

commit a4190d44fa744707229f0ca737bddec36f9aae8c Merge: 7c360ee75 eacfd2911 Author: Nick Mathewson Date: Fri Mar 23 17:49:29 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) __

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

commit 7c360ee7581e606149e16c460d08117b8933e8d1 Merge: f1a88ec11 79d3f401a Author: Nick Mathewson Date: Fri Mar 23 11:18:23 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25560 | 5 + src/test/include.am | 2 +- src/test/test_rust.sh | 23 +---

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

commit 76d14aabd405003c815abcc3513172060c629fc5 Merge: 5b32475fb 95b78d417 Author: Nick Mathewson Date: Wed Mar 21 17:04:41 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 doc/HACKING/CodingStandardsRust.md | 36 ++ scripts/maint/updateRustDependencie

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

commit f1a88ec11be7bed98362c9cf6891043d58a853ac Merge: 76d14aabd 2b3138741 Author: Nick Mathewson Date: Wed Mar 21 17:10:10 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/ext/rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 5b32475fb0ee8c51cd5a032facbeec6c01434203 Merge: 0aff795b7 b06997914 Author: Nick Mathewson Date: Tue Mar 20 12:55:46 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25306| 6 ++ src/or/hs_service.c | 32 2 files changed,

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

commit 0aff795b78ba7401402e6dff316159ea986a672d Merge: 87c7e96ea 74c767af2 Author: Nick Mathewson Date: Tue Mar 20 07:59:13 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 doc/HACKING/CodingStandardsRust.md | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) __

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

commit 87c7e96eaafb7acb13b38928e2c0f80554303cae Merge: 19421ffcf fd36bd897 Author: Nick Mathewson Date: Tue Mar 20 07:50:46 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25372 | 3 +++ src/or/circuitlist.c | 8 2 files changed, 11 insertions(+)

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

commit 19421ffcf3fef22bd221279afceb137354d0a3bf Merge: f5f4a6861 910422e8f Author: Nick Mathewson Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ___

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

commit f5f4a68610c7e17d3f8a600d7be412b7c463528a Merge: 3bda8ab0a 85719b79b Author: Nick Mathewson Date: Mon Mar 19 05:42:43 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 24 1 file changed, 20 insertions(+), 4 deletions(-) ___

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

commit 3bda8ab0aeb15cabbee3f184cad0f3d7f81c205b Merge: f5f377ecb 9d1c7c3a8 Author: Nick Mathewson Date: Mon Mar 19 05:39:56 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25479 | 4 src/test/bench.c | 2 ++ 2 files changed, 6 insertions(+) __

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

commit f5f377ecb219d45c01dc24de90f7fc7b180128e0 Merge: 5ee93047c 296e429eb Author: Nick Mathewson Date: Mon Mar 19 05:36:06 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25450 | 8 src/test/test_hs_service.c | 11 ++- 2 files changed, 14 i

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

commit 5ee93047cbf711398ba7425b86d961e688cfaa53 Merge: 504dc5a93 f0f2fab5e Author: Nick Mathewson Date: Tue Mar 13 11:03:08 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++- 2 files changed, 13 insertions(+

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

commit 504dc5a93c33db5871305e3b501bb08c4210cb92 Merge: 09612b19c 6bc324c96 Author: Nick Mathewson Date: Tue Mar 13 10:59:30 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org htt

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

commit 09612b19c52ede4c8d2a89aaf18ab20e46014e66 Merge: 0456ec215 950606dcc Author: Nick Mathewson Date: Tue Mar 13 10:58:03 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ---

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

commit 0456ec21530f3364c0f41f1492e428ff330f24b0 Merge: ed73b086b 676a28599 Author: Nick Mathewson Date: Tue Mar 13 13:44:09 2018 +0100 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25474 | 5 + configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) _

<    1   2   3   >