[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit 34cadefe3455d2536d207e62caaade6a723a0ddb
Merge: 8183640ad 0489288aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 20 09:04:35 2018 -0500

    Merge branch 'maint-0.3.5'

 changes/bug28524              | 4 ++++
 src/feature/control/control.c | 4 ++++
 2 files changed, 8 insertions(+)