[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug19702'

[nickm at torproject.org]

commit d70fac15ff07f65f4963eb1a0ab299eb335f6700
Merge: 4bdd360 d8cd994
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 26 19:12:23 2016 -0400

    Merge remote-tracking branch 'teor/bug19702'

 changes/bug19702    |  3 +++
 src/or/rendclient.c | 21 +++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)