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

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

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

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

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

commit 3808e3015a75def1cfa7554aae4c6b06d9498d73 Merge: 8093a63f9 72ee0b6f7 Author: Nick Mathewson Date: Fri Jun 29 23:12:03 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 scripts/maint/checkSpace.pl | 5 - 1 file changed, 5 deletions(-)

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

commit 75a6e7e256719c33329cd172248f4f2dfc80ad8c Merge: d3ecb3a8d 36c372581 Author: Nick Mathewson Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_channelpadding.c | 1 + src/test/test_hs_descriptor.c | 3 +++ src/test/test_shared_random.c

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

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

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

commit f6b30a97a96837e012b296a43cc99018d96bcf13 Merge: 5ab23e03f f82f8179e Author: Nick Mathewson Date: Fri Jun 29 13:06:15 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket26467| 3 +++ src/or/directory.c | 1 + src/or/hs_descriptor.c

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

commit 5ab23e03fa0a8bce11798cbf025139e9653b9be4 Merge: c08102ea7 df896ed63 Author: Nick Mathewson Date: Fri Jun 29 13:02:56 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/or/dirauth/shared_random_state.c | 1 + src/or/routerlist.c | 2 +- src/test/test_hs.c

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

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

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

commit 97925322a18d3e21dcad3d44d01b78eab7e50db5 Merge: 73bc86382 8b108935b Author: Nick Mathewson Date: Thu Jun 21 08:54:02 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

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

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

commit 70e672f8567088ce6ce704dc1f51dd3ce2873a38 Merge: 8184f45ad a360bf287 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

commit 8184f45ad94b5305c519f427a503d14ecb2f12dd Merge: 71ddfbaad ccf1eb316 Author: Nick Mathewson Date: Sat Jun 16 13:10:19 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

<    1   2