Merge branch 'openssl' of https://github.com/PurpleI2P/i2pd into openssl

contrib/i2pd.conf

@@ -192,8 +192,8 @@ verify = true
 
 [addressbook]
 ## AddressBook subscription URL for initial setup
-## Default: inr.i2p at "mainline" I2P Network
-# defaulturl = http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt
+## Default: reg.i2p at "mainline" I2P Network
+# defaulturl = http://shx5vqsw7usdaunyzr2qmes2fq37oumybpudrd4jjj4e4vk4uusa.b32.i2p/hosts.txt
 ## Optional subscriptions URLs, separated by comma
 # subscriptions = http://inr.i2p/export/alive-hosts.txt,http://stats.i2p/cgi-bin/newhosts.txt,http://rus.i2p/hosts.txt
 

daemon/Daemon.cpp

@@ -35,8 +35,8 @@
 
 namespace i2p
 {
-	namespace util
-	{
+namespace util
+{
 	class Daemon_Singleton::Daemon_Singleton_Private
 	{
 	public:
@@ -213,7 +213,9 @@ namespace i2p
 		if (isFloodfill) {
 			LogPrint(eLogInfo, "Daemon: router will be floodfill");
 			i2p::context.SetFloodfill (true);
-			}	else {
+		}
+		else
+		{
 			i2p::context.SetFloodfill (false);
 		}