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

[nickm at torproject.org]

commit 17d7095e117892fb32e4ba73ecbaee9f043df64f
Merge: 9a60e46ae 5b28190c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 15 12:47:46 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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