fixed merge with master

libretroshare/src/rsserver/p3face-server.cc

@@ -139,7 +139,7 @@ RsServer::~RsServer()
 
 
         /* Thread Fn: Run the Core */
-void 	RsServer::data_tick()
+void RsServer::threadTick()
 {
 	rstime::rs_usleep(mTimeDelta * 1000000);
 

libretroshare/src/rsserver/p3face.h

@@ -88,9 +88,7 @@ public:
 	void setShutdownCallback(const std::function<void(int)>& callback)
 	{ mShutdownCallback = callback; }
 
-
-		/* Thread Fn: Run the Core */
-        virtual void data_tick();
+	void threadTick() override; /// @see RsTickingThread
 
 		/* locking stuff */
 		void    lockRsCore() 

libretroshare/src/rsserver/p3peers.cc

@@ -1859,3 +1859,5 @@ RsPeerStateChangedEvent::RsPeerStateChangedEvent(RsPeerId sslId) :
     RsEvent(RsEventType::PEER_STATE_CHANGED), mSslId(sslId) {}
 
 RsPeers::~RsPeers() = default;
+RsAuthSslConnectionAutenticationEvent::~RsAuthSslConnectionAutenticationEvent() = default;
+RsConnectionEvent::~RsConnectionEvent() = default;

libretroshare/src/rsserver/rsinit.cc

@@ -45,7 +45,7 @@
 #include "retroshare/rsnotify.h"
 #include "retroshare/rsiface.h"
 #include "plugins/pluginmanager.h"
-
+#include "retroshare/rsversion.h"
 #include "rsserver/rsloginhandler.h"
 #include "rsserver/rsaccounts.h"
 
@@ -96,10 +96,6 @@ RsDht *rsDht = NULL ;
 
 #ifdef RS_JSONAPI
 #	include "jsonapi/jsonapi.h"
-#ifdef RS_WEBUI
-#include "jsonapi/jsonapi.h"
-#endif
-
 #endif
 
 #ifdef RS_BROADCAST_DISCOVERY
@@ -195,6 +191,9 @@ static const int SSLPWD_LEN = 64;
 
 void RsInit::InitRsConfig()
 {
+	RsInfo() << " libretroshare version: " << RS_HUMAN_READABLE_VERSION
+	         << std::endl;
+
 	rsInitConfig = new RsInitConfig;