From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Jun 2015 13:10:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/rendcache_027_01'
X-Git-Tag: tor-0.2.7.2-alpha~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b35d8508835f23b8e804982db368c0304a08d40;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'dgoulet/rendcache_027_01'
---

8b35d8508835f23b8e804982db368c0304a08d40