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

[arma at torproject.org]

commit bdc2cefd4e3c6190e74337021889b90be4b6768b
Merge: eb3e0e3 472696e
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jul 24 19:49:29 2014 -0400

    Merge branch 'maint-0.2.5'

 src/or/channel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)