commit 8b35d8508835f23b8e804982db368c0304a08d40 Merge: 1edaef2 a7624de Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 19 09:10:03 2015 -0400

Merge remote-tracking branch 'dgoulet/rendcache_027_01'

src/or/include.am | 2 + src/or/or.h | 9 - src/or/relay.c | 1 + src/or/rendcache.c | 579 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/rendcache.h | 56 +++++ src/or/rendclient.h | 2 + src/or/rendcommon.c | 583 --------------------------------------------------- src/or/rendcommon.h | 21 -- 8 files changed, 640 insertions(+), 613 deletions(-)