commit 16dd2f7bb0df8c6d45d62e4d515089a3a566fd8e Merge: 5746e210b eb7a3fae0 Author: Nick Mathewson nickm@torproject.org Date: Sun Jun 17 20:25:40 2018 -0400

Merge remote-tracking branch 'rl1987/bug25477'

changes/bug25477 | 3 +++ src/or/rendcache.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)