[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 169c81844d130ed6f245db4c6641d151a556e880
Merge: 384e300 3cb79a0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 20 00:03:43 2011 -0400

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

 changes/bug4251      |    8 ++++++++
 src/or/rendservice.c |   13 +++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)