commit bda3c544478f40270d60fbe93e4d8703a1c5ff5e Merge: ee1bbe21a cdee62da9 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)