[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug2767'

[nickm at torproject.org]

commit 824df4a08ec9af8d8ac6b4ecacc1a6fdbc87ac8b
Merge: 77e4a01 270b4f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 3 12:37:36 2013 -0400

    Merge remote-tracking branch 'public/bug2767'

 changes/bug2767     |    2 ++
 src/or/directory.c  |   15 ++++++++++-
 src/or/directory.h  |    5 ++++
 src/test/test_dir.c |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 1 deletion(-)