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

[nickm at torproject.org]

commit de069f5ea73a4fe841df27d85c28c0d79ad2c13e
Merge: b79d50d 96b929e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 3 11:16:48 2011 -0400

    Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2

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