commit d6568bad5e12af0e202f82c3ca86ae9aaeb443e4 Merge: 536df2187 98c103d91 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 14 17:18:38 2017 -0400 Merge branch 'bug23499' changes/bug23499 | 6 +++ src/or/directory.c | 110 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 69 insertions(+), 47 deletions(-)