[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug18623_028_01'

[nickm at torproject.org]

commit d5f50cb052a535b5193dc14ccfd3239a722943c2
Merge: 4f86d75 ba6509e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 24 15:03:50 2016 -0400

    Merge remote-tracking branch 'dgoulet/bug18623_028_01'

 src/or/directory.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)