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

[nickm at torproject.org]

commit 86e0be421f14f386327f95df2cea0b3c59323463
Merge: 796e36e53 5b28190c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 15 12:47:46 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.3

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