commit f4992beb566401241cf1dd1d464f4aaade4751f7
Merge: 2be259f 29a82b5
Author: Roger Dingledine <[email protected]>
Date: Mon Jul 28 02:48:11 2014 -0400
Merge branch 'maint-0.2.5' into release-0.2.5
changes/bug1038-3 | 6 ++++++
changes/bug12718 | 5 +++++
src/or/channel.c | 2 +-
src/or/command.c | 20 ++++++++++++++++----
src/or/control.c | 2 +-
5 files changed, 29 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
