[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

[nickm at torproject.org]

commit fec5aa75f4c50f6b307edbc7662bdb9c5a73f617
Merge: b463773 07cca62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 15 11:55:46 2015 -0500

    Merge branch 'maint-0.2.7'

 changes/bug17827       |    3 +++
 src/common/backtrace.c |   16 ++++++++--------
 src/common/backtrace.h |    2 +-
 src/common/sandbox.c   |    2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)