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

[nickm at torproject.org]

commit a4930de5e96b83295478386cd15c8a7a3e8c0ef8
Merge: b6de39e5f df18cf0e8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:44:40 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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