commit d7ec1708b1a6bc659e5671463dc493fcf0a9f482 Merge: 0ef5b8d 8b93cbc Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 12:00:53 2016 -0500

Merge branch 'maint-0.2.9'

changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-)