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

[nickm at torproject.org]

commit 4a17c541b7a217ca5580fc01d35d2d0d620a31d1
Merge: 3e9409e fec73c8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 24 11:54:16 2015 -0500

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

 changes/bug11454 |    2 +-
 changes/bug11457 |    2 +-
 changes/bug14980 |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)