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_reader.h b/src/tls/tls_reader.h
index 162f691aa..8c2e9efe2 100644
--- a/src/tls/tls_reader.h
+++ b/src/tls/tls_reader.h
@@ -154,8 +154,8 @@ class TLS_Data_Reader
          {
          if(buf.size() - offset < n)
             {
-            throw Decoding_Error("TLS_Data_Reader: Expected " + to_string(n) +
-                                 " bytes remaining, only " + to_string(buf.size()-offset) +
+            throw Decoding_Error("TLS_Data_Reader: Expected " + std::to_string(n) +
+                                 " bytes remaining, only " + std::to_string(buf.size()-offset) +
                                  " left");
             }
          }