commit 9e25422eed03ad5fe8f54653fbc74668561f43a1
Merge: aba25a6 230422b
Author: Nick Mathewson <[email protected]>
Date: Tue Nov 29 17:38:19 2011 -0500
Merge branch 'multilevel_cfg'
changes/config | 26 +++++
src/or/config.c | 315 ++++++++++++++++++++++++++++++++++++++----------------
src/or/config.h | 6 +-
src/or/control.c | 8 +-
src/or/dirserv.c | 2 +-
src/or/or.h | 14 +++
6 files changed, 272 insertions(+), 99 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
