commit 24352d0d70542d43588a5c5a6da3f63a317d049d Merge: 8656cbc 929a8f1 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 3 09:47:57 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.6'

changes/bug11447 | 5 +++++ src/or/rendservice.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)