commit 46cd466decfcf05cc7588256aa7e9491a7c9e918 Merge: 34b4da7 5b20701 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 21 10:00:52 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7' changes/bug17401 | 3 +++ src/or/rendcache.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)