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

[nickm at torproject.org]

commit 18734d3b25f3a26fea3fd78e64136da9bcd3836d
Merge: 3c017e823 0117e2ea0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 12:58:22 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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