1 files changed, 5 insertions, 1 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 73433a8d8..48ab1eadf 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -244,7 +244,7 @@ namespace cryptonote
       cnx.current_download = cntxt.m_current_speed_down / 1024;
       cnx.current_upload = cntxt.m_current_speed_up / 1024;
 
-      cnx.connection_id = cntxt.m_connection_id;
+      cnx.connection_id = epee::string_tools::pod_to_hex(cntxt.m_connection_id);
 
       cnx.height = cntxt.m_remote_blockchain_height;
 
@@ -1414,6 +1414,10 @@ skip:
         // take out blocks we already have
         while (!context.m_needed_objects.empty() && m_core.have_block(context.m_needed_objects.front()))
         {
+          // if we're popping the last hash, record it so we can ask again from that hash,
+          // this prevents never being able to progress on peers we get old hash lists from
+          if (context.m_needed_objects.size() == 1)
+            context.m_last_known_hash = context.m_needed_objects.front();
           context.m_needed_objects.pop_front();
         }
         const uint64_t first_block_height = context.m_last_response_height - context.m_needed_objects.size() + 1;