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

[nickm at torproject.org]

commit e64157a54f02eb422c87cfdab718eede08e9790a
Merge: 580c68ec1 c61cd5775
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 08:10:11 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, 3 insertions(+), 7 deletions(-)