resync with lt trunk

libtorrent/src/peer_connection.cpp

@@ -499,7 +499,7 @@ namespace libtorrent
 		{
 			// we couldn't find the torrent!
 #ifdef TORRENT_VERBOSE_LOGGING
-			(*m_logger) << " couldn't find a torrent with the given info_hash\n";
+			(*m_logger) << " couldn't find a torrent with the given info_hash: " << ih << "\n";
 #endif
 			throw std::runtime_error("got info-hash that is not in our session");
 		}
@@ -2254,7 +2254,6 @@ namespace libtorrent
 		assert(m_reading);
 		m_reading = false;
 
-		
 		if (error)
 		{
 #ifdef TORRENT_VERBOSE_LOGGING

libtorrent/src/torrent.cpp

@@ -1779,7 +1779,7 @@ namespace libtorrent
 			= instantiate_connection(m_ses.m_io_service, m_ses.peer_proxy());
 		boost::intrusive_ptr<peer_connection> c(new bt_peer_connection(
 			m_ses, shared_from_this(), s, a, peerinfo));
-			
+
 #ifndef NDEBUG
 		c->m_in_constructor = false;
 #endif
@@ -2855,3 +2855,4 @@ namespace libtorrent
 
 }
 
+