commit dbfe8a42a4631795d4cea8d6020cb619d790cc62 Merge: 81b5483ee 710188f84 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 12 14:32:16 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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