[tor-commits] [tor/master] Merge branch 'ticket16698_v2'

[nickm at torproject.org]

commit 60e9e484487b1163bc531b72597ee24741ce4df0
Merge: 00ee62b 03ae44a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 11 13:39:38 2016 -0400

    Merge branch 'ticket16698_v2'

 src/or/directory.c | 293 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 219 insertions(+), 74 deletions(-)