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

[nickm at torproject.org]

commit c99fec4999a31a56cd6a6cf573c589c5cd690830
Merge: d37bc7287 61330f40a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 8 13:26:50 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 README           | 3 +++
 src/or/dirvote.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)