commit 67749475f56532235602e0c8d1a9a59a68d816c3 Merge: 9d0af78 ac5ae79 Author: Nick Mathewson nickm@torproject.org Date: Sat Feb 15 15:06:06 2014 -0500

Merge remote-tracking branch 'public/bug10841'

changes/bug10841 | 6 ++ src/or/directory.c | 104 ++++----------------- src/or/or.h | 15 +-- src/or/rendclient.c | 3 +- src/or/rendcommon.c | 260 ++++----------------------------------------------- src/or/rendcommon.h | 18 ++-- 6 files changed, 56 insertions(+), 350 deletions(-)