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

[nickm at torproject.org]

commit d1ec7bb06e41d6f4b79c5709c6d7be62393939e7
Merge: 3462f8ed6 86e0be421
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 15 12:47:46 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 src/common/util_bug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)