[tor-commits] [tor/master] Merge remote-tracking branch 'donncha/feature14846_4'

[nickm at torproject.org]

commit 0b3190d4b73be07dd78c3c0bca8b30651915fc37
Merge: 0e03a04 08b1738
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 2 13:40:26 2015 +0200

    Merge remote-tracking branch 'donncha/feature14846_4'

 changes/feature14846 |    4 ++
 src/or/control.c     |   43 +++++++++++++++
 src/or/control.h     |    3 +
 src/or/main.c        |    3 +-
 src/or/rendcache.c   |  137 +++++++++++++++++++++++++++++++++++++++++++--
 src/or/rendcache.h   |   11 +++-
 src/or/rendcommon.c  |    7 +++
 src/or/rendservice.c |  150 +++++++++++++++++++++++++-------------------------
 src/test/test.c      |    4 ++
 9 files changed, 280 insertions(+), 82 deletions(-)