[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit 78a7479445509df3c3330af2171f4ca3cf3f7c35
Merge: 54fedab54 94a799815
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 13 18:57:04 2018 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/ticket28731           | 4 ++++
 src/feature/control/control.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)