commit edfa746888d5492693becd7d1c74b4c934503790 Merge: d79557efc fea35ddf0 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 30 08:45:01 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug26924 | 4 ++++ changes/bug26927 | 4 ++++ src/or/connection_or.c | 14 +++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)