[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 8d3c3f039d89bf27cdb825fcb4806c9135597154
Merge: 8b5b3b5fb 431c8d09e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 12:58:22 2017 -0400

    Merge branch 'maint-0.3.1'

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