[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2

[nickm at torproject.org]

commit 8adec8705014ef7e788a1dcf5d3a4a2d85a328ed
Merge: 0cc7a63 56546324
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 9 11:03:20 2011 -0500

    Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2

 changes/bug4426      |    8 ++++++++
 src/or/rendservice.c |    9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)