[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm at torproject.org]

commit a5e873ff29d066532322a6946c2bc4d034be8c2d
Merge: 6ef3531 03eb999
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 10:28:16 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.7'

 src/or/rendcache.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)