commit 294f5bb7e4ee8d07c1848196917e536c2432822f Merge: 092190476 fd528a088 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 15 10:37:52 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27709 | 4 ++++ src/common/util_bug.h | 57 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 13 deletions(-)