commit 9a50c731040fea3b85b0c84726d56194993f09e9 Merge: cfe0a45 5a0eab6 Author: Nick Mathewson nickm@torproject.org Date: Mon May 22 10:57:26 2017 -0400

Merge remote-tracking branch 'ahf/bugs/22305'

src/or/directory.c | 87 ++++++++++++++++++++++++++++++++++++++++++++---------- src/or/directory.h | 1 + 2 files changed, 73 insertions(+), 15 deletions(-)