commit 94a79981580d6260597f799bc1a163c8e6f07acd Merge: a3fe08164 1b855af5e Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 13 18:57:00 2018 -0500

Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5

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