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

[nickm at torproject.org]

commit 3ada086d380845b11e6f35cfde93a02bf2dbbb6e
Merge: 745ffd6d3 431c8d09e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 12:58:22 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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