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

[nickm at torproject.org]

commit bc2d9357f523d87385229087cb13253874f070f0
Merge: b5edc83 9648f03
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 10 22:50:52 2011 -0400

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

 changes/bug4212     |   13 +++++++++++++
 src/or/rendclient.c |   18 ++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)