Test merge

.github/workflows/linux.yml

@@ -276,7 +276,7 @@ jobs:
       - name: run tests (flaky)
         env:
           LSAN_OPTIONS: suppressions=${{ github.workspace }}/.asan.suppressions
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@v4
         with:
           timeout_minutes: 30
           retry_wait_seconds: 4

.github/workflows/macos.yml

@@ -54,7 +54,7 @@ jobs:
         run: (cd test; b2 ${{ matrix.config }} -l400 warnings-as-errors=on debug-iterators=on invariant-checks=full asserts=on deterministic-tests)
 
       - name: run tests (flaky)
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@v4
         with:
           timeout_minutes: 30
           retry_wait_seconds: 1

.github/workflows/windows.yml

@@ -116,7 +116,7 @@ jobs:
           b2 --hash release msvc-version-macro=on address-model=64 link=static debug-iterators=off invariant-checks=on define=BOOST_ASIO_DISABLE_IOCP asserts=on testing.execute=off
 
       - name: run sims
-        uses: nick-fields/retry@v3
+        uses: nick-fields/retry@v4
         with:
           max_attempts: 3
           timeout_minutes: 120

ChangeLog

@@ -22,6 +22,12 @@
 	* libtorrent now requires C++17 to build
 	* added support for WebTorrent
 
+2.0.13
+
+	* optimize v2 request sizes
+	* fix socks5 issues
+	* fix issue in loading v2 resume data merkle trees
+
 2.0.12 released
 
 	* fix issue where file priorities could be cleared by force recheck

bindings/python/CMakeLists.txt

@@ -97,7 +97,8 @@ else()
 	execute_process(
 		COMMAND "${Python3_EXECUTABLE}" -c [=[
 import sysconfig
-print(sysconfig.get_path('platlib', vars={'platbase': '', 'base': ''}))
+# Strip leading separator - cmake would otherwise treat this as an absolute path.
+print(sysconfig.get_path('platlib', vars={'platbase': '', 'base': ''}).lstrip('/\\'))
 ]=]
 		OUTPUT_VARIABLE _PYTHON3_SITE_ARCH
 		OUTPUT_STRIP_TRAILING_WHITESPACE

include/libtorrent/aux_/proxy_base.hpp

@@ -289,9 +289,10 @@ struct proxy_base
 	{
 		TORRENT_ASSERT(m_magic == 0x1337);
 		if (!e) return false;
-		std::forward<Handler>(h)(e);
 		error_code ec;
-		close(ec);
+		// prevent lifetime management use-after-free
+		close(ec); // close first
+		std::move(h)(e); // consume
 		return true;
 	}