[tor-commits] [torspec/master] Merge remote-tracking branch 'rransom/bug2720'

[nickm at torproject.org]

commit e52b2be829a9a8027c173568b6d841feb3c1096a
Merge: 49b1795 bf46e42
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 26 13:23:11 2011 -0400

    Merge remote-tracking branch 'rransom/bug2720'

 rend-spec.txt |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)