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

[nickm at torproject.org]

commit 47e7a167d23c6ba1492a4006f6275e34c6a57b14
Merge: cbcff6759 a47b8fcf9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 8 19:29:10 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23139     | 3 +++
 src/or/consdiffmgr.c | 1 +
 2 files changed, 4 insertions(+)