commit 3cb79a0286e3e4f87d590511f3cedb02e28de972 Merge: 5aa45ed 739c21e Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 20 00:01:58 2011 -0400
Merge remote-tracking branch 'rransom-tor/bug4251-022' into maint-0.2.2
changes/bug4251 | 8 ++++++++ src/or/rendservice.c | 13 +++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)