Merge pull request #1833 from jgarzik/mempool-query

Send 'mempool' P2P command at the start of each P2P session

diff --cc src/init.cpp
index d271893644891f10984910684d8e00020d8676ee,df3a0f1fd587f7b51d1388b54dfeb1a317673654..b910c2dd76e39d7f44b77e89e60334c2ec8de499
--- 1/src/init.cpp
--- 2/src/init.cpp
+++ b/src/init.cpp
@@@ -470,10 -470,12 +471,12 @@@ bool AppInit2(
      printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
      printf("Bitcoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
      printf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
+ 
+     nTimeNodeStart = GetTime();
      if (!fLogTimestamps)
-         printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
+         printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", nTimeNodeStart).c_str());
      printf("Default data directory %s\n", GetDefaultDataDir().string().c_str());
 -    printf("Used data directory %s\n", GetDataDir().string().c_str());
 +    printf("Used data directory %s\n", pszDataDir);
      std::ostringstream strErrors;
  
      if (fDaemon)

diff --cc src/main.cpp
Simple merge