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

[nickm at torproject.org]

commit c69e96680a8db0d3d0c20e68f8f8d6727470ece4
Merge: 283730a d443658
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 13 23:15:44 2014 -0400

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

 changes/bug12848      |    4 ++++
 src/or/channel.c      |    8 ++++++++
 src/or/circuitbuild.c |   12 ++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)