[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

[nickm at torproject.org]

commit 1c5e7430efbc3bb03596957d454c9ff6825de67b
Merge: 1ace56149 f288f2478
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 09:05:18 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug26896   | 3 +++
 src/or/directory.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)