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

[nickm at torproject.org]

commit d3874e4cbca233cf83ae0da55e68fb27deafdd82
Merge: 6402144 a40d212
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 11 20:37:02 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug19926_029_info | 3 +++
 src/or/connection_edge.c  | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)