commit 79e12da86199fbfcf44aa7e569ea2d938156108b Merge: dcf8cdd fb68f50 Author: Nick Mathewson <[email protected]> Date: Sun Jan 18 13:49:30 2015 -0500
Merge remote-tracking branch 'public/bug12485'
changes/bug12485 | 4 ++++
src/or/entrynodes.c | 13 ++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
