[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit df18cf0e8fa9195df82bef9535f920ad913efab7
Merge: 08d5fd39d a5ed62f96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:44:40 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27463    | 3 +++
 src/or/rendclient.c | 9 +++++++++
 2 files changed, 12 insertions(+)