April 2018 - tor-commits - lists.torproject.org

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit b83991fce37aa35dc0b2790d7fa41de42806e793 Merge: 5a2232e62 0e13ff481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 src/common/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 5e0fbd7006993a4e402f2eee49f6f86074923197 Merge: db6902c23 0e13ff481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 5e0fbd7006993a4e402f2eee49f6f86074923197 Merge: db6902c23 0e13ff481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Fix an LCOV exclusion pattern in address.c
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 0e13ff48155ca8cda7483afe730652bed61ba5a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:21 2018 -0400 Fix an LCOV exclusion pattern in address.c --- src/common/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 68ad63941..96b99fa08 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1199,7 +1199,7 @@ tor_addr_hash(const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } } @@ -1221,7 +1221,7 @@ tor_addr_keyed_hash(const struct sipkey *key, const tor_addr_t *addr) /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; - /* LCOV_EXCL_END */ + /* LCOV_EXCL_STOP */ } }

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit ae0ee020269e439068d1a4caa99c2e0c09117ccf Merge: 8eb9aaf4f 5e0fbd700 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 677789b680763d18ac1e81815b838ec32f3a37d0 Merge: a6f21a61d c5899d5cf Author: Nick Mathewson <nickm(a)torproject.org> 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(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit c5899d5cf3a761f4049c1d6f05232731edcfeb57 Merge: d3ac47b41 5e0fbd700 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 5e0fbd7006993a4e402f2eee49f6f86074923197 Merge: db6902c23 0e13ff481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit 9ef4c05df8323850b5894782f435da15810d6189 Merge: 22845df2a c5899d5cf Author: Nick Mathewson <nickm(a)torproject.org> 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(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 16 Apr '18

16 Apr '18

commit c5899d5cf3a761f4049c1d6f05232731edcfeb57 Merge: d3ac47b41 5e0fbd700 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 13:48:23 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/common/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0