[tor-commits] [tor/master] Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged

[nickm at torproject.org]

commit 9ed02ec2824059b9c18c2cadfd972c8a2e09b94c
Merge: 00ca3d04c 537ad0bca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 29 14:28:48 2019 -0400

    Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged

 changes/ticket29662        |  5 ++++
 src/core/or/circuituse.c   |  4 +++-
 src/lib/log/util_bug.c     | 59 ++++++++++++++++++++++++++++++++++++++--------
 src/lib/log/util_bug.h     | 44 ++++++++++++++++++++++++----------
 src/test/test_bt_cl.c      |  2 +-
 src/test/testing_rsakeys.c |  3 ++-
 6 files changed, 92 insertions(+), 25 deletions(-)