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

[nickm at torproject.org]

commit 50e4c98a5acb6d10203cc943a336abb7715414cf
Merge: 14c0251 de069f5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 3 11:18:03 2011 -0400

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

 changes/bug2748     |   10 ++++++++++
 src/or/rendcommon.c |   13 ++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)