commit ed7f2482e2de6f5d08dfcd605626ae8ee373cace Merge: 0ec135b fb0de57 Author: Nick Mathewson <[email protected]> Date: Mon Mar 9 13:08:20 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6'
changes/feature15006 | 4 ++++
src/or/control.c | 15 +++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
