commit 69c47ab5fd608ecd47ddd3c1d2f041a2b41791b5 Merge: 4dc8dc4 55d6fd2 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 10 15:38:52 2016 -0500 Merge remote-tracking branch 'sebastian/bug18242' Makefile.am | 4 ++++ changes/bug18242 | 6 ++++++ configure.ac | 8 ++++++++ src/common/util.h | 7 ++++--- src/test/test_rendcache.c | 4 ++-- 5 files changed, 24 insertions(+), 5 deletions(-)