Merge branch 'master' of https://github.com/arvidn/libtorrent

include/libtorrent/aux_/session_impl.hpp

@@ -819,6 +819,8 @@ namespace libtorrent
 			// peer class for local peers
 			peer_class_t m_local_peer_class{0};
 
+			resolver m_host_resolver;
+
 			tracker_manager m_tracker_manager;
 			torrent_map m_torrents;
 
@@ -1163,8 +1165,6 @@ namespace libtorrent
 			// time it's called, to force the windows disk cache to be flushed
 			deadline_timer m_close_file_timer;
 
-			resolver m_host_resolver;
-
 			// the index of the torrent that will be offered to
 			// connect to a peer next time on_tick is called.
 			// This implements a round robin peer connections among

src/session_impl.cpp

@@ -423,6 +423,7 @@ namespace aux {
 		, m_disk_thread(m_io_service, m_stats_counters)
 		, m_download_rate(peer_connection::download_channel)
 		, m_upload_rate(peer_connection::upload_channel)
+		, m_host_resolver(m_io_service)
 		, m_tracker_manager(
 			std::bind(&session_impl::send_udp_packet, this, false, _1, _2, _3, _4)
 			, std::bind(&session_impl::send_udp_packet_hostname, this, _1, _2, _3, _4, _5)
@@ -462,7 +463,6 @@ namespace aux {
 		, m_timer(m_io_service)
 		, m_lsd_announce_timer(m_io_service)
 		, m_close_file_timer(m_io_service)
-		, m_host_resolver(m_io_service)
 	{
 		update_time_now();
 	}