commit 4bbdebff3fc47755df233a1720fbab81eb1cc344 Merge: a49fb1e 9228db5 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 3 14:05:26 2016 -0400 Merge remote-tracking branch 'arma/bug20277' src/or/directory.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)