July 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 9c96dbe7b01a5415fd070f4901f4125b20c29dfc Merge: e6d7752 ff8c230 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:43:31 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 15fddaffd59ab335ad7da5509889cdf2ca48047c Merge: d4f08c7 5434b24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:43:31 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 5434b2451e73bd4cd5eb62fb5e6c468eeee70153 Merge: 0f97f96 546f5b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:43:31 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit f6420bceec9707324fe23c98a2a70dd2612f183f Merge: 3de2761 ff8c230 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:32 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit ff8c230d7cadb6c24dcf9c121521cff976fc83a5 Merge: ccae991 0ee15c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:26 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --cc src/test/test_addr.c index 50011e6,645fc64..2c126e6 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -346,9 -340,15 +346,18 @@@ test_addr_ip6_helpers(void test_pton6_bad("a:::b:c"); test_pton6_bad(":::a:b:c"); test_pton6_bad("a:b:c:::"); + test_pton6_bad("1.2.3.4"); + test_pton6_bad(":1.2.3.4"); + test_pton6_bad(".2.3.4"); + /* Regression tests for 22789. */ + test_pton6_bad("0xfoo"); + test_pton6_bad("0x88"); + test_pton6_bad("0xyxxy"); + test_pton6_bad("0XFOO"); + test_pton6_bad("0X88"); + test_pton6_bad("0XYXXY"); + test_pton6_bad("0x"); + test_pton6_bad("0X"); /* test internal checking */ test_external_ip("fbff:ffff::2:7", 0);

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 546f5b364bd8198b23b1ad4e66790eb1ce9b438e Merge: 8bc70a2 32c0066 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:43:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug22789_024' into maint-0.2.4
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 0ee15c92d5486fc73ba49dea7f12bf2f89012cfb Merge: d56f699 bb3f74e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:41:27 2017 -0400 Merge branch 'bug22789_024' into maint-0.2.4 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 6cd6d488dc2469df82d74f0fcc3c84f5b45e8447 Merge: 9a0fd2d f6420bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:37 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit ff8c230d7cadb6c24dcf9c121521cff976fc83a5 Merge: ccae991 0ee15c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:26 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --cc src/test/test_addr.c index 50011e6,645fc64..2c126e6 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@@ -346,9 -340,15 +346,18 @@@ test_addr_ip6_helpers(void test_pton6_bad("a:::b:c"); test_pton6_bad(":::a:b:c"); test_pton6_bad("a:b:c:::"); + test_pton6_bad("1.2.3.4"); + test_pton6_bad(":1.2.3.4"); + test_pton6_bad(".2.3.4"); + /* Regression tests for 22789. */ + test_pton6_bad("0xfoo"); + test_pton6_bad("0x88"); + test_pton6_bad("0xyxxy"); + test_pton6_bad("0XFOO"); + test_pton6_bad("0X88"); + test_pton6_bad("0XYXXY"); + test_pton6_bad("0x"); + test_pton6_bad("0X"); /* test internal checking */ test_external_ip("fbff:ffff::2:7", 0);

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit f6420bceec9707324fe23c98a2a70dd2612f183f Merge: 3de2761 ff8c230 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 13:42:32 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug22789 | 6 ++++++ src/common/compat.c | 8 ++++++-- src/test/test_addr.c | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-)

1 0