Merge branch 'master' into merge-mining

src/p2p_server.cpp

@@ -1435,7 +1435,7 @@ void P2PServer::P2PClient::reset()
 
 bool P2PServer::P2PClient::on_connect()
 {
-	P2PServer* server = static_cast<P2PServer*>(m_owner);
+	const P2PServer* server = static_cast<P2PServer*>(m_owner);
 
 	if (!server) {
 		return false;

src/util.h

@@ -35,7 +35,7 @@
 namespace p2pool {
 
 #define P2POOL_VERSION_MAJOR 3
-#define P2POOL_VERSION_MINOR 8
+#define P2POOL_VERSION_MINOR 9
 #define P2POOL_VERSION_PATCH 0
 
 extern const char* VERSION;