commit 40154c1f9eeb378f5aac11c23ed26215ddfc26f3 Merge: 699bb803b e9dbd6dd8 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 13 10:00:58 2018 +0100 Merge branch 'maint-0.3.3' src/or/tor_api.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)