commit 86409ec247f167aa6a3d123672f03a7dbfb3d011 Merge: eb7596672 658171318 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 24 12:35:26 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/27286 | 4 ++++ src/or/dirauth/dirvote.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)