commit b0ea36d779a0d9e5d94bdb056fb20b93240e404c Merge: caaaea2 2b27ce5 Author: Nick Mathewson nickm@torproject.org Date: Tue May 5 15:06:57 2015 -0400

Merge remote-tracking branch 'public/bug15821_025'

changes/bug15823 | 4 ++++ src/or/rendservice.c | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-)