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

[nickm at torproject.org]

commit df387b94e8c4ebac964dcf2227b9a01d6a9481cc
Merge: 9f6bb29 471b0c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 19 17:17:12 2016 -0400

    Merge remote-tracking branch 'chelseakomlo/master'

 changes/ticket20077      |  5 +++++
 src/or/connection_edge.c |  2 +-
 src/or/directory.c       | 52 +++++++++++++++++++++----------------------
 src/or/directory.h       |  3 ---
 src/test/test_dir.c      | 57 +++++++++++++++++++++++++++++++++++++++++++-----
 5 files changed, 83 insertions(+), 36 deletions(-)