merged RC_1_1 into master

ChangeLog

@@ -91,6 +91,8 @@
 	* resume data no longer has timestamps of files
 	* require C++11 to build libtorrent
 
+1.1.11 release
+
 	* fix move_storage with save_path with a trailing slash
 	* fix tracker announce issue, advertising port 0 in secondary IPv6 announce
 	* fix missing boost/noncopyable.hpp includes

Makefile.am

@@ -120,6 +120,7 @@ EXTRA_DIST = \
   LibtorrentRasterbarConfig.cmake.in \
   cmake/Modules/FindLibGcrypt.cmake \
   cmake/Modules/GeneratePkgConfig.cmake \
+  cmake/Modules/LibtorrentMacros.cmake \
   cmake/Modules/ucm_flags.cmake \
   cmake/Modules/GeneratePkgConfig/generate-pkg-config.cmake.in \
   cmake/Modules/GeneratePkgConfig/pkg-config.cmake.in \

bindings/python/Makefile.am

@@ -4,6 +4,7 @@ EXTRA_DIST = \
   CMakeLists.txt            \
   setup.py.cmake.in         \
   setup.py                  \
+  setup.py.cmake.in         \
   client.py                 \
   simple_client.py          \
   make_torrent.py           \

include/libtorrent/torrent.hpp

@@ -1421,7 +1421,7 @@ namespace libtorrent {
 		// the number of bytes that has been
 		// downloaded that failed the hash-test
 		std::int32_t m_total_failed_bytes = 0;
-		std::int32_t m_total_redundant_bytes = 0;
+		std::int64_t m_total_redundant_bytes = 0;
 
 		// the sequence number for this torrent, this is a
 		// monotonically increasing number for each added torrent

src/natpmp.cpp

@@ -633,6 +633,8 @@ void natpmp::on_reply(error_code const& e
 		return;
 	}
 
+	if (m_abort) return;
+
 	ADD_OUTSTANDING_ASYNC("natpmp::on_reply");
 	// make a copy of the response packet buffer
 	// to avoid overwriting it in the next receive call
@@ -845,8 +847,6 @@ void natpmp::on_reply(error_code const& e
 			, errors::pcp_success, portmap_transport::natpmp);
 	}
 
-	if (m_abort) return;
-
 	m_currently_mapping = port_mapping_t{-1};
 	m->act = portmap_action::none;
 	m_send_timer.cancel(ec);