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

[nickm at torproject.org]

commit 004a125e14720b77d81eefb3c6e29a45c2353064
Merge: bb32475c0 0117e2ea0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 12:58:22 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug23030_029  |  7 +++++++
 src/common/util_bug.h | 13 +++++++++++++
 2 files changed, 20 insertions(+)