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

[nickm at torproject.org]

commit 6ae9769b29330815c6c094ef43bafd6fa13b7626
Merge: 55e1fe8 a726cd7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 4 12:29:25 2015 +0100

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

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