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

[nickm at torproject.org]

commit cb28fe486ff7f9ebc81a7ccc90f5459429572587
Merge: dd3f2f6 bb21d14
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 11 10:08:58 2014 -0500

    Merge remote-tracking branch 'public/bug10722'

 changes/bug10722    |    8 ++++++++
 src/or/rendclient.c |   27 +++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)