commit 90fb57ec18c6c19df736097c6f56a00f00951571 Merge: d1a1d95c4 61330f40a Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 8 13:26:50 2017 -0500 Merge branch 'maint-0.3.2' README | 3 +++ src/or/dirvote.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)