commit c1f0ec3058117d7f0feca09b9ed9d7fa2e71e5a5 Merge: ba88d78 85edef2 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 20 10:20:41 2016 -0400 Merge remote-tracking branch 'dgoulet/bug19465_029_01' src/test/test_rendcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)