[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit 3462f8ed6430bdb1528a7b63aaf2281489eb04d1
Merge: fd528a088 796e36e53
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 15 10:48:35 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 src/common/util_bug.h | 7 ++++++-
 src/or/hs_common.c    | 7 +++----
 2 files changed, 9 insertions(+), 5 deletions(-)