[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug12202'
nickm at torproject.org
nickm at torproject.org
Wed Jul 16 14:54:54 UTC 2014
commit 368ff2291b0b400e0ee908ad465ed6f0f56330ec
Merge: f74a932 8bbb217
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Jul 16 16:49:07 2014 +0200
Merge remote-tracking branch 'asn/bug12202'
src/or/entrynodes.c | 43 ++++++++++++++++++++++-------
src/or/entrynodes.h | 13 +++++++++
src/test/test_entrynodes.c | 66 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 112 insertions(+), 10 deletions(-)
More information about the tor-commits
mailing list