commit 8d16c2f30e14ebf0e9a44c71a7e500c4381869f4 Merge: 4bb44f2 8251fe5 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 25 17:19:59 2016 -0400

Merge remote-tracking branch 'arma/bug18625'

src/or/directory.c | 70 ++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 41 deletions(-)