commit 66cad7e97347b7bae9564ef0d205bf1f87a76185 Merge: f68d4318e 98e1a1d10 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 24 12:32:10 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/27286 | 4 ++++ src/or/dirserv.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)