commit af58a89b86c462a23e39ba60b04812fd23734e1b Merge: 43092e2 0a3009b Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 6 19:14:02 2016 -0400

Merge remote-tracking branch 'teor/bug20012'

changes/bug20012 | 12 ++++++++++++ src/or/rendclient.c | 41 ++++++++--------------------------------- 2 files changed, 20 insertions(+), 33 deletions(-)