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

[tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit f97f301b5b5605f559522ffae2159fc4d061817c Merge: dc3890439 461e34bb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:39 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 3bca705c544bd56ade5a25022b51d395f038444f Merge: 6e3ec8222 953a8f851 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 6abdc77c3ad708d205528f60e4bd112e498c077e Merge: 47e87f2be 953a8f851 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit cf3da63b9023875e93c05d30fb6d76e047bebe70 Merge: 66e99096b b86c9acac Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 953a8f851081e6157e9296186c296ab10106b7eb Merge: 495db72c1 f97f301b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.0] Fix a clang compilation warning in rendservice.c
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 461e34bb3dec0f4f7234584806a224040f44c7ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:15 2017 -0500 Fix a clang compilation warning in rendservice.c Fixes bug 24480; bugfix on 0.2.5.16. --- changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug24480 b/changes/bug24480 new file mode 100644 index 000000000..94e5b91a0 --- /dev/null +++ b/changes/bug24480 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix a signed/unsigned comparison warning introduced by our + fix to TROVE-2017-009. Fixes bug 24480; bugfix on 0.2.5.16. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ba8891ead..80e1e10a0 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1162,7 +1162,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, time_t now = time(NULL); time_t elapsed; int replay; - size_t keylen; + ssize_t keylen; /* Do some initial validation and logging before we parse the cell */ if (circuit->base_.purpose != CIRCUIT_PURPOSE_S_INTRO) {

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit b86c9acac360c23749f007c29f1bdd7b8347c18d Merge: 909c91049 5c03bb7c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit f97f301b5b5605f559522ffae2159fc4d061817c Merge: dc3890439 461e34bb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:39 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 01 Dec '17

01 Dec '17

commit 3ec72ef52aa3fa9871335b1713e090e3677987d7 Merge: 235083308 f97f301b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

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

01 Dec '17

commit 5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8 Merge: 7fae562a4 3bca705c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0