[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug1090-part1-squashed' into bug1090-part1-squashed

[nickm at torproject.org]

commit 99621bc5a629a81a5a823ce21ac3d967443d0e12
Merge: 8f6cb93 0c40dda
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 27 13:45:28 2011 -0400

    Merge remote-tracking branch 'arma/bug1090-part1-squashed' into bug1090-part1-squashed

 src/or/rendclient.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)