commit 125c8e54680c936b9e532597372c62ac47af4fa9 Merge: 03e0c7e bd83d0e Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 15 20:55:28 2014 -0400

Merge remote-tracking branch 'public/bug11465'

changes/bug11465 | 9 +++++++++ src/common/backtrace.c | 18 ++++++++++++++++-- src/common/backtrace.h | 6 ++++++ src/common/sandbox.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 2 deletions(-)