commit 160629d4a7e431116e18a04678efe784c4d513ea Merge: 67af36397 98ee23ca1 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 12 14:32:16 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/task26771 | 4 ++++ src/or/auth_dirs.inc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)