[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

[nickm at torproject.org]

commit 2f67a6e8c95aadadfc55b6245668471f7def72e6
Merge: e48f8e5 f2ff814
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 4 15:02:47 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6'

 changes/bug16247    |    5 +++++
 src/or/connection.c |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)