commit 63234b183963054b01f71fa8e318add0a640cea8 Merge: c8c2298 b2a050c Author: Nick Mathewson <[email protected]> Date: Tue Oct 8 12:03:09 2013 -0400
Merge branch 'bug9922'
changes/bug9922 | 5 +++++
src/or/directory.c | 5 +++--
src/or/relay.c | 5 +++--
3 files changed, 11 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
