Merge remote-tracking branch 'chelseakomlo/master'

changes/ticket20077

src/or/connection_edge.c

src/or/directory.c

src/or/directory.h

src/test/test_dir.c