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

[nickm at torproject.org]

commit a242d194c74b318b8ee4b347efd09ed13d0d2549
Merge: bdd267e 711160a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 11:04:44 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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