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

Merge branch 'maint-0.3.2' into maint-0.3.3

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