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

[nickm at torproject.org]

commit 53d88eb1ecf7714772d9cb54a1d649e518dd5f47
Merge: 5e9d349 fe48114
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 10 19:23:44 2012 -0500

    Merge branch 'bug3825c_squashed'

 src/or/rendservice.c |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)