commit 7e9f1d6992fd815c973049ed621daacf16ff0201 Merge: 294f5bb7e 3462f8ed6 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 15 10:48:35 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 src/common/util_bug.h | 7 ++++++- src/or/hs_common.c | 7 +++---- 2 files changed, 9 insertions(+), 5 deletions(-)