lt sync 3209

libtorrent/bindings/python/src/converters.cpp

@@ -9,7 +9,7 @@ using namespace boost::python;
 template<class T1, class T2>
 struct pair_to_tuple
 {
-    static PyObject* convert(const std::pair<T1, T2>& p)
+    static PyObject* convert(const std::pair<int, int>& p)
     {
         return incref(make_tuple(p.first, p.second).ptr());
     }

libtorrent/src/file_pool.cpp

@@ -57,7 +57,8 @@ namespace libtorrent
 			lru_file_entry e = *i;
 			e.last_use = time_now();
 
-			if (e.key != st)
+			if (e.key != st && ((e.mode & file::rw_mask) != file::read_only
+				|| (m & file::rw_mask) != file::read_only))
 			{
 				// this means that another instance of the storage
 				// is using the exact same file.

libtorrent/src/session_impl.cpp

@@ -2163,7 +2163,6 @@ namespace aux {
 		mutex_t::scoped_lock l(m_mutex);
 		if (m_dht) e = m_dht->state();
 		done = true;
-		l.unlock();
 		c.notify_all();
 	}