[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge branch 'directory_guards_rebased'
commit 265aab298ad923425e136013f6c439b5fba32558
Merge: 68dae4c c2c6e8e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Tue Dec 25 23:22:54 2012 -0500
Merge branch 'directory_guards_rebased'
changes/dirguards | 8 +++
doc/tor.1.txt | 12 +++++
src/or/circuituse.c | 4 +-
src/or/config.c | 2 +
src/or/directory.c | 67 +++++++++++++++++++++++---
src/or/entrynodes.c | 132 +++++++++++++++++++++++++++++++++++++++++----------
src/or/entrynodes.h | 4 +-
src/or/or.h | 3 +
8 files changed, 196 insertions(+), 36 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits