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

[tor/release-0.3.1] Merge branch 'teor-bug22797-025' into maint-0.2.9
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit a25d97e53046132567fd78e82791a2f8cad7b199 Merge: 3cace828a 878e0d45a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:28:59 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.2.9 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit d4f87073aec5e8ef6090cf8f246ffd7483968567 Merge: 72ea4a8f0 c894e9d3d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/maint-0.3.1] Merge branch 'teor-bug22797-025' into maint-0.2.9
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit a25d97e53046132567fd78e82791a2f8cad7b199 Merge: 3cace828a 878e0d45a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:28:59 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.2.9 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.0] Fix mixed-sign comparison warning in fix for 22797.
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 6a49e3360bcb30b267da4a47af749bd4571ee72d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:56:57 2017 -0400 Fix mixed-sign comparison warning in fix for 22797. --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3ebcfad14..e16dfb1d2 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1719,7 +1719,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) int bad = 1; #ifdef OPEN_MAX uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; - if (errno == EINVAL && try_limit < rlim.rlim_cur) { + if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ rlim.rlim_cur = try_limit;

1 0

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

11 Sep '17

commit c894e9d3d44bceaf209a9b73c2c43911af3eb1a8 Merge: f5092e711 6a49e3360 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit c894e9d3d44bceaf209a9b73c2c43911af3eb1a8 Merge: f5092e711 6a49e3360 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'teor-bug22797-025' into maint-0.2.9
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit a25d97e53046132567fd78e82791a2f8cad7b199 Merge: 3cace828a 878e0d45a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:28:59 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.2.9 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.0] Merge branch 'teor-bug22797-025' into maint-0.2.9
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit a25d97e53046132567fd78e82791a2f8cad7b199 Merge: 3cace828a 878e0d45a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:28:59 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.2.9 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

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

11 Sep '17

commit 40f385dee73295695222c63a2ce0c62aa808e11c Merge: 2fc33716e 6a49e3360 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.1] Fix mixed-sign comparison warning in fix for 22797.
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 6a49e3360bcb30b267da4a47af749bd4571ee72d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:56:57 2017 -0400 Fix mixed-sign comparison warning in fix for 22797. --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3ebcfad14..e16dfb1d2 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1719,7 +1719,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) int bad = 1; #ifdef OPEN_MAX uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; - if (errno == EINVAL && try_limit < rlim.rlim_cur) { + if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ rlim.rlim_cur = try_limit;

1 0