Merge fixups. Add locking to default session manager. Use chrono lib

and unique_ptr.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/tls/tls_version.cpp b/src/tls/tls_version.cpp
index 4445998eb..82dce0be9 100644
--- a/src/tls/tls_version.cpp
+++ b/src/tls/tls_version.cpp
@@ -19,13 +19,13 @@ std::string Protocol_Version::to_string() const
 
    // Some very new or very old protocol?
    if(maj != 3)
-      return "Protocol " + Botan::to_string(maj) + "." + Botan::to_string(min);
+      return "Protocol " + std::to_string(maj) + "." + std::to_string(min);
 
    if(maj == 3 && min == 0)
       return "SSL v3";
 
    // The TLS v1.[0123...] case
-   return "TLS v1." + Botan::to_string(min-1);
+   return "TLS v1." + std::to_string(min-1);
    }
 
 }