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

[nickm at torproject.org]

commit da38904efbdd0c2c6b754aed7f75201e3c1cd97a
Merge: 2ea573ece eecfed0cd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:56:31 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

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