commit 4bfc3557990c2b06cfb008c8a2af277df2ea40ba Merge: b1267114c 4e653ac2c Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 17 11:12:33 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug24898 | 8 ++++++++ src/or/command.c | 6 ------ src/or/connection_or.c | 6 ++++++ src/rust/Cargo.lock | 12 ++++++------ 4 files changed, 20 insertions(+), 12 deletions(-)