[tor-commits] [tor/master] Merge branch 'bug6255'

[nickm at torproject.org]

commit ed2601f2be0978c37c0ae086b2a8d2f7d94078fc
Merge: 630677f 6abdcdf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 00:43:59 2012 -0400

    Merge branch 'bug6255'

 src/or/rendservice.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)