commit f288f2478a5d455cd151e8fd13fe3ed66dfd75e5 Merge: 8ed4f1ee8 21a9d0344 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 09:05:14 2018 -0400

Merge branch 'bug26896_034' into maint-0.3.4

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