commit 32eba3d6aa7bd39048d32a566d119c013e526759 Merge: fd16dd2 a242d19 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 27 11:04:44 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

changes/bug22737 | 12 ++++++++++++ src/or/connection_or.c | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-)