commit fe0d1c666135cab1a06ff12e7e954efb17b08aef Merge: dfc1b62 fbc2029 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 18 11:01:31 2013 -0500

Merge branch 'backtrace_squashed_merged'

.gitignore | 2 + LICENSE | 33 ++++++++ changes/stack_trace | 8 ++ configure.ac | 9 +++ m4/pc_from_ucontext.m4 | 131 ++++++++++++++++++++++++++++++ src/common/backtrace.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ src/common/backtrace.h | 12 +++ src/common/include.am | 2 + src/common/log.c | 140 +++++++++++++++++++++++++++----- src/common/sandbox.c | 47 ++--------- src/common/sandbox.h | 3 - src/common/torlog.h | 8 +- src/common/util.c | 111 +++++++++++++++++--------- src/common/util.h | 17 ++-- src/or/config.c | 3 +- src/or/main.c | 10 ++- src/test/bt_test.py | 42 ++++++++++ src/test/include.am | 12 +++ src/test/test.c | 3 + src/test/test_bt_cl.c | 110 ++++++++++++++++++++++++++ src/test/test_logging.c | 135 +++++++++++++++++++++++++++++++ src/test/test_util.c | 51 ++++++++++++ 22 files changed, 977 insertions(+), 114 deletions(-)