commit fd528a0884e706f5ad10422d0c4501ce35254530 Merge: ffaf180b7 dff7d3d00 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 15 10:37:52 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

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