commit 9d12bdaa1dd2763b044e71fe687ee2b3d2f74c90 Merge: 9d49dd6 33b5bfb Author: Nick Mathewson <nickm@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(-)