[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3311'

[nickm at torproject.org]

commit e6782b355ae77455aaff3af9fe3831c07312a5c8
Merge: 72acdfe 8740977
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 18 12:07:39 2012 -0400

    Merge remote-tracking branch 'public/bug3311'

 changes/bug3311      |    5 +++++
 src/or/rendservice.c |    6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)