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

[nickm at torproject.org]

commit 80038b545359e5156fde6d6be4015bdf7f80e779
Merge: 385c597 fc4158d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 2 15:06:04 2011 -0400

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

 changes/bug3309     |   13 +++++++++++++
 src/or/main.c       |    3 +--
 src/or/rendclient.c |   46 +++++++++++++++++++++++++++++++++++++++++++---
 src/or/rendclient.h |    3 +++
 src/or/rendcommon.c |    4 +++-
 5 files changed, 63 insertions(+), 6 deletions(-)