commit fc4a3b30c8e329d408eb2e6bd922f5cb8a5ff10b Merge: cd12ee6 a873ba8 Author: Nick Mathewson <[email protected]> Date: Thu May 26 12:12:41 2016 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
src/or/router.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
