commit fe8f7748202816a9b90e04db542e449145283a66 Merge: 77e678c20 d0525c38d Author: Nick Mathewson <nickm at torproject.org> Date: Tue Jul 3 11:34:36 2018 -0400 Merge branch 'bug26522' changes/bug26522 | 6 ++++++ src/lib/err/backtrace.c | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-)