[tor-commits] [tor/master] Merge branch 'tor-github/pr/696'

commit a30f17f72fb4e016f1c0d7f8619fcb20fec29d16 Merge: c22446e30 8d04dc416 Author: David Goulet dgoulet@torproject.org Date: Wed Feb 20 11:29:55 2019 -0500

Merge branch 'tor-github/pr/696'

changes/ticket28816 | 4 ++++ src/core/mainloop/connection.c | 17 +++++++++++++++++ src/core/mainloop/connection.h | 2 ++ src/feature/dircache/dircache.c | 28 ++++++++++------------------ src/feature/dircache/dirserv.c | 20 +++++++------------- 5 files changed, 40 insertions(+), 31 deletions(-)