Merge branch 'openssl' into my_fixes

This commit is contained in:
l-n-s 2016-10-28 20:28:11 +00:00
commit d68544038c
6 changed files with 130 additions and 26 deletions

View file

@ -176,6 +176,7 @@ namespace config {
trust.add_options()
("trust.enabled", value<bool>()->default_value(false), "Enable explicit trust options")
("trust.family", value<std::string>()->default_value(""), "Router Familiy to trust for first hops")
("trust.routers", value<std::string>()->default_value(""), "Only Connect to these routers")
("trust.hidden", value<bool>()->default_value(false), "Should we hide our router from other routers?");
m_OptionsDesc