[tor-commits] [tor/release-0.2.2] Merge branch 'bug4424' into maint-0.2.2

[arma at torproject.org]

commit ca282e53263de564774944a8aa93e88271983461
Merge: 4d8306e 02d89c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 11:47:28 2011 -0500

    Merge branch 'bug4424' into maint-0.2.2

 changes/bug4424     |    6 ++++++
 src/or/rendclient.c |    9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)