commit fa0257eda0b985349b3777776a6613ca850132b2 Merge: e046903f9 f81e4aa83 Author: George Kadianakis desnacked@riseup.net Date: Thu Oct 31 15:31:14 2019 +0800

Merge branch 'tor-github/pr/1484'

changes/bug25568 | 5 +++++ src/feature/rend/rendcache.c | 11 +++++++++++ src/feature/rend/rendcache.h | 2 ++ src/feature/rend/rendclient.c | 19 +++++++++++++++---- 4 files changed, 33 insertions(+), 4 deletions(-)