commit 49e243f88526ffe76530c1e7dfc37ae374db3239 Merge: 2d227dcfc 0489288aa Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 20 09:04:35 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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