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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.1'

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