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

[nickm at torproject.org]

commit a47b8fcf9295111339b80e5bc81c3de428241cad
Merge: 5368eaf62 3af4aafbc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 8 19:29:05 2017 -0400

    Merge branch 'bug23139' into maint-0.3.1

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