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

[nickm at torproject.org]

commit 5278d72f97683c8c89117d5b7111eb5f84baa569
Merge: c68bfc556 ca2d9cbb9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 26 10:32:53 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug24903 | 5 +++++
 src/or/control.c | 3 +++
 2 files changed, 8 insertions(+)