merged fixes from RC_0_16

ChangeLog

@@ -22,6 +22,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* python binding fix issue where torrent_info objects where destructing when their torrents were deleted
 	* added missing field to scrape_failed_alert in python bindings
 	* GCC 4.8 fix
 	* fix proxy failure semantics with regards to anonymous mode

bindings/python/src/torrent_handle.cpp

@@ -300,6 +300,11 @@ namespace
     }
 }
 
+boost::intrusive_ptr<const torrent_info> get_torrent_info(torrent_handle const& h)
+{
+   return boost::intrusive_ptr<const torrent_info>(&h.get_torrent_info());
+}
+
 void force_reannounce(torrent_handle& th, int s)
 {
     th.force_reannounce(boost::posix_time::seconds(s));
@@ -371,7 +376,7 @@ void bind_torrent_handle()
         .def("add_http_seed", _(&torrent_handle::add_http_seed))
         .def("remove_http_seed", _(&torrent_handle::remove_http_seed))
         .def("http_seeds", http_seeds)
-        .def("get_torrent_info", _(&torrent_handle::get_torrent_info), return_internal_reference<>())
+        .def("get_torrent_info", get_torrent_info)
         .def("set_metadata", set_metadata)
         .def("is_valid", _(&torrent_handle::is_valid))
         .def("pause", _(&torrent_handle::pause), arg("flags") = 0)

include/libtorrent/torrent.hpp

@@ -123,7 +123,7 @@ namespace libtorrent
 #endif
 
 		sha1_hash const& info_hash() const
-		{ return m_torrent_file->info_hash(); }
+		{ return m_torrent_file ? m_torrent_file->info_hash() : sha1_hash(); }
 
 		// starts the announce timer
 		void start();