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

[asn at torproject.org]

commit 4185ef29fd637b4ca4aefffb4d50146acab395c3
Merge: af7cf7d5c ef2123c7c
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Aug 19 18:06:05 2019 +0300

    Merge branch 'tor-github/pr/1122'

 changes/ticket24964               |  4 +++
 src/feature/dircache/dircache.c   | 13 ++++----
 src/feature/dircommon/directory.c | 69 +++++++++++++++++++++++++++++++++++++++
 src/feature/dircommon/directory.h |  1 +
 src/test/test_hs_cache.c          | 23 +++++++++++--
 5 files changed, 102 insertions(+), 8 deletions(-)