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