commit 4a7225d4c97b956f6fe6b7d806c3a29b91d26c35 Merge: 25875f5 749b37b Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 7 11:57:07 2011 -0500

Merge remote-tracking branch 'rransom-tor/bug4411'

changes/bug4411 | 10 ++++++++++ src/or/rendclient.c | 15 +++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-)