commit 959af2024789c32a3daa74360a173fb16cf092fd Merge: 86aa7f0a3 4e653ac2c Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 17 11:13:18 2018 -0500

Merge branch 'maint-0.3.2'

changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ 3 files changed, 14 insertions(+), 6 deletions(-)