Merge pull request #494 from PurpleI2P/openssl

2.7.0

HTTPServer.cpp

@@ -510,7 +510,7 @@ namespace http {
 		/* commands */
 		s << "<b>Router Commands</b><br>\r\n";
 		s << "  <a href=/?cmd=" << HTTP_COMMAND_RUN_PEER_TEST << ">Run peer test</a><br>\r\n";
-		s << "  <a href=/?cmd=" << HTTP_COMMAND_RELOAD_CONFIG << ">Reload config</a><br>\r\n";
+		//s << "  <a href=/?cmd=" << HTTP_COMMAND_RELOAD_CONFIG << ">Reload config</a><br>\r\n";
 		if (i2p::context.AcceptsTunnels ())
 			s << "  <a href=/?cmd=" << HTTP_COMMAND_STOP_ACCEPTING_TUNNELS << ">Stop accepting tunnels</a><br>\r\n";
 		else	

version.h

@@ -1,13 +1,13 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define CODENAME "Bora Bora"
+#define CODENAME "Purple"
 
 #define STRINGIZE(x) #x
 #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c)
 
 #define I2PD_VERSION_MAJOR 2
-#define I2PD_VERSION_MINOR 6
+#define I2PD_VERSION_MINOR 7
 #define I2PD_VERSION_MICRO 0
 #define I2PD_VERSION_PATCH 0
 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)