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

[nickm at torproject.org]

commit ed73b086b786e2a9248a19f8b8f29272096cd196
Merge: 6d44cf66c e9dbd6dd8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 13 10:01:30 2018 +0100

    Merge branch 'maint-0.3.3' into release-0.3.3

 src/or/tor_api.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)