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

[nickm at torproject.org]

commit 35edd74e25cb077a89a9d6c14e542d1d1ffc7c8e
Merge: d14b009 5d45a26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 10:56:40 2015 -0400

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

 src/or/rendcache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)