- tor-commits - lists.torproject.org

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit 9d12bdaa1dd2763b044e71fe687ee2b3d2f74c90 Merge: 9d49dd6 33b5bfb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 09:24:27 2015 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug17819 | 4 ++++ changes/bug17827 | 3 +++ configure.ac | 1 + src/common/backtrace.c | 22 +++++++++++----------- src/common/backtrace.h | 2 +- src/common/compat_pthreads.c | 3 ++- src/common/sandbox.c | 4 ++-- 7 files changed, 24 insertions(+), 15 deletions(-)

1 0

[tor/master] Don't call pthread_condattr_setclock() unless it exists
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit 33b5bfb94824a55254f1ffcddf38ac17589a2744 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 09:23:44 2015 -0500 Don't call pthread_condattr_setclock() unless it exists Fixes bug 17819; bugfix on 0.2.6.3-alpha (specifically, d684dbb0). --- changes/bug17819 | 4 ++++ configure.ac | 1 + src/common/compat_pthreads.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug17819 b/changes/bug17819 new file mode 100644 index 0000000..45c55f7 --- /dev/null +++ b/changes/bug17819 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Don't try to use the pthrad_condattr_setclock() function unless + it actually exists. Fixes compilation on NetBSD-6.x. Fixes bug + 17819; bugfix on 0.2.6.3-alpha. diff --git a/configure.ac b/configure.ac index d37c34d..2f75568 100644 --- a/configure.ac +++ b/configure.ac @@ -425,6 +425,7 @@ AC_CHECK_FUNCS( if test "$bwin32" != true; then AC_CHECK_HEADERS(pthread.h) AC_CHECK_FUNCS(pthread_create) + AC_CHECK_FUNCS(pthread_condattr_setclock) fi if test "$bwin32" = true; then diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index 4b32fc9..b1d87d3 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -185,7 +185,8 @@ tor_cond_init(tor_cond_t *cond) return -1; } -#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) +#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) \ + && defined(HAVE_PTHREAD_CONDATTR_SETCLOCK) /* Use monotonic time so when we timedwait() on it, any clock adjustment * won't affect the timeout value. */ if (pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC)) {

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit 3317cd3a1f4e3a7883bf9a5eba3f9a13097fe437 Merge: a5da27c 33b5bfb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 09:24:40 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17819 | 4 ++++ configure.ac | 1 + src/common/compat_pthreads.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/master] ... and fix the linux backtrace_symbols{, _fd} calls
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit e0aa4f837c62d1b6df37bba071023ec24f3191cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 08:20:53 2015 -0500 ... and fix the linux backtrace_symbols{,_fd} calls --- src/common/backtrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 8d544ed..bed0442 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -96,7 +96,7 @@ log_backtrace(int severity, int domain, const char *msg) tor_mutex_acquire(&cb_buf_mutex); depth = backtrace(cb_buf, MAX_DEPTH); - symbols = backtrace_symbols(cb_buf, depth); + symbols = backtrace_symbols(cb_buf, (int)depth); tor_log(severity, domain, "%s. Stack trace:", msg); if (!symbols) { @@ -139,7 +139,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) n_fds = tor_log_get_sigsafe_err_fds(&fds); for (i=0; i < n_fds; ++i) - backtrace_symbols_fd(cb_buf, depth, fds[i]); + backtrace_symbols_fd(cb_buf, (int)depth, fds[i]); abort(); } @@ -175,7 +175,7 @@ install_bt_handler(void) * reads won't be denied by the sandbox code */ char **symbols; size_t depth = backtrace(cb_buf, MAX_DEPTH); - symbols = backtrace_symbols(cb_buf, depth); + symbols = backtrace_symbols(cb_buf, (int) depth); if (symbols) free(symbols); }

1 0

[tor/master] ... and fix another backtrace_symbols_fd call in sandbox.c
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit 784e9fff9baa4fb63712de5dd9cc0ac530e2eb23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 09:05:49 2015 -0500 ... and fix another backtrace_symbols_fd call in sandbox.c --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 3a9f2a1..950a92f 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1630,7 +1630,7 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) #ifdef USE_BACKTRACE n_fds = tor_log_get_sigsafe_err_fds(&fds); for (i=0; i < n_fds; ++i) - backtrace_symbols_fd(syscall_cb_buf, depth, fds[i]); + backtrace_symbols_fd(syscall_cb_buf, (int)depth, fds[i]); #endif #if defined(DEBUGGING_CLOSE)

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit a5da27cb35987bdab7a9ebec907056be974289a5 Merge: 9d17d10 784e9ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 09:07:11 2015 -0500 Merge branch 'maint-0.2.7' src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.2.7] Don't call pthread_condattr_setclock() unless it exists
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit 33b5bfb94824a55254f1ffcddf38ac17589a2744 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 09:23:44 2015 -0500 Don't call pthread_condattr_setclock() unless it exists Fixes bug 17819; bugfix on 0.2.6.3-alpha (specifically, d684dbb0). --- changes/bug17819 | 4 ++++ configure.ac | 1 + src/common/compat_pthreads.c | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug17819 b/changes/bug17819 new file mode 100644 index 0000000..45c55f7 --- /dev/null +++ b/changes/bug17819 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Don't try to use the pthrad_condattr_setclock() function unless + it actually exists. Fixes compilation on NetBSD-6.x. Fixes bug + 17819; bugfix on 0.2.6.3-alpha. diff --git a/configure.ac b/configure.ac index d37c34d..2f75568 100644 --- a/configure.ac +++ b/configure.ac @@ -425,6 +425,7 @@ AC_CHECK_FUNCS( if test "$bwin32" != true; then AC_CHECK_HEADERS(pthread.h) AC_CHECK_FUNCS(pthread_create) + AC_CHECK_FUNCS(pthread_condattr_setclock) fi if test "$bwin32" = true; then diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index 4b32fc9..b1d87d3 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -185,7 +185,8 @@ tor_cond_init(tor_cond_t *cond) return -1; } -#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) +#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) \ + && defined(HAVE_PTHREAD_CONDATTR_SETCLOCK) /* Use monotonic time so when we timedwait() on it, any clock adjustment * won't affect the timeout value. */ if (pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC)) {

1 0

[tor/maint-0.2.7] ... and fix the linux backtrace_symbols{, _fd} calls
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit e0aa4f837c62d1b6df37bba071023ec24f3191cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 08:20:53 2015 -0500 ... and fix the linux backtrace_symbols{,_fd} calls --- src/common/backtrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 8d544ed..bed0442 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -96,7 +96,7 @@ log_backtrace(int severity, int domain, const char *msg) tor_mutex_acquire(&cb_buf_mutex); depth = backtrace(cb_buf, MAX_DEPTH); - symbols = backtrace_symbols(cb_buf, depth); + symbols = backtrace_symbols(cb_buf, (int)depth); tor_log(severity, domain, "%s. Stack trace:", msg); if (!symbols) { @@ -139,7 +139,7 @@ crash_handler(int sig, siginfo_t *si, void *ctx_) n_fds = tor_log_get_sigsafe_err_fds(&fds); for (i=0; i < n_fds; ++i) - backtrace_symbols_fd(cb_buf, depth, fds[i]); + backtrace_symbols_fd(cb_buf, (int)depth, fds[i]); abort(); } @@ -175,7 +175,7 @@ install_bt_handler(void) * reads won't be denied by the sandbox code */ char **symbols; size_t depth = backtrace(cb_buf, MAX_DEPTH); - symbols = backtrace_symbols(cb_buf, depth); + symbols = backtrace_symbols(cb_buf, (int) depth); if (symbols) free(symbols); }

1 0

[tor/maint-0.2.7] ... and fix another backtrace_symbols_fd call in sandbox.c
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit 784e9fff9baa4fb63712de5dd9cc0ac530e2eb23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 16 09:05:49 2015 -0500 ... and fix another backtrace_symbols_fd call in sandbox.c --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 3a9f2a1..950a92f 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1630,7 +1630,7 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) #ifdef USE_BACKTRACE n_fds = tor_log_get_sigsafe_err_fds(&fds); for (i=0; i < n_fds; ++i) - backtrace_symbols_fd(syscall_cb_buf, depth, fds[i]); + backtrace_symbols_fd(syscall_cb_buf, (int)depth, fds[i]); #endif #if defined(DEBUGGING_CLOSE)

1 0

[torspec/master] Bug 16081: Document status code consistency in single reply
by nickm＠torproject.org 16 Dec '15

16 Dec '15

commit 03aaace9bd9459b0d4bf22a75012acf39d07bcec Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 13 12:01:30 2015 +0000 Bug 16081: Document status code consistency in single reply --- control-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 0fddb54..a3c1647 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -169,8 +169,9 @@ ReplyText = XXXX StatusCode = 3DIGIT - Specific replies are mentioned below in section 3, and described more fully - in section 4. + Multiple lines in a single reply from Tor to the controller are guaranteed to + share the same status code. Specific replies are mentioned below in section 3, + and described more fully in section 4. [Compatibility note: versions of Tor before 0.2.0.3-alpha sometimes generate AsyncReplies of the form "*(MidReplyLine / DataReplyLine)".

1 0