[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11048'

[nickm at torproject.org]

commit 92da2e27a216d5251ed6bdcef7c005ab11f2676f
Merge: 613b0a3 a3ab31f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 25 10:23:09 2014 -0500

    Merge remote-tracking branch 'public/bug11048'

 changes/bug11048       |    8 ++++++++
 src/common/backtrace.c |   22 ++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)