[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm at torproject.org]

commit 711160a46f5fbba7106c23c29f99bed75928a5a7
Merge: 1c64133 3483f7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 11:04:44 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

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