diff --git a/ChangeLog b/ChangeLog index 90b8687dde8..caf609986d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.15 released + * cache DNS lookups for SOCKS5 proxy * fix stalled pieces on disk-full errors * fix build configuration issue on NetBSD, OpenBSD and DragonFly diff --git a/Jamfile b/Jamfile index 07c8249075a..c05ece57e0c 100644 --- a/Jamfile +++ b/Jamfile @@ -864,7 +864,7 @@ rule generate-pkg-config ( properties * ) local libname = [ $(props[2]).name ] ; props = $(props[1]) ; - local FULL_VERSION = 1.2.14 ; + local FULL_VERSION = 1.2.15 ; p = [ install-paths $(properties) ] ; diff --git a/bindings/python/setup.py b/bindings/python/setup.py index ad6489259fc..a89644016c8 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -452,7 +452,7 @@ def _configure_b2_with_distutils(self, python_binding_dir): setuptools.setup( name="libtorrent", - version="1.2.14", + version="1.2.15", author="Arvid Norberg", author_email="arvid@libtorrent.org", description="Python bindings for libtorrent-rasterbar", diff --git a/build_dist.sh b/build_dist.sh index f3e2ea81dcd..c27cfd62f66 100755 --- a/build_dist.sh +++ b/build_dist.sh @@ -16,7 +16,7 @@ chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp ./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes make dist -VERSION=1.2.14 +VERSION=1.2.15 tar xvzf libtorrent-rasterbar-${VERSION}.tar.gz cd libtorrent-rasterbar-${VERSION}/test diff --git a/configure.ac b/configure.ac index 25a1622ae57..8b88483db29 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[1.2.14],[arvid@libtorrent.org], +AC_INIT([libtorrent-rasterbar],[1.2.15],[arvid@libtorrent.org], [libtorrent-rasterbar],[http://www.libtorrent.org]) AC_CONFIG_SRCDIR([src/torrent.cpp]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/docs/header.rst b/docs/header.rst index a02203ec070..bcb0d3d3e7c 100644 --- a/docs/header.rst +++ b/docs/header.rst @@ -1,3 +1,3 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.2.14 +:Version: 1.2.15 diff --git a/docs/hunspell/libtorrent.dic b/docs/hunspell/libtorrent.dic index e3afc541d39..b8f93d79d7b 100644 --- a/docs/hunspell/libtorrent.dic +++ b/docs/hunspell/libtorrent.dic @@ -545,7 +545,7 @@ cpp tos BP qB -LT12E0 +LT12F0 iocontrol getname getpeername diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index ddcfad88894..b83052d3524 100644 --- a/include/libtorrent/version.hpp +++ b/include/libtorrent/version.hpp @@ -37,14 +37,14 @@ POSSIBILITY OF SUCH DAMAGE. #define LIBTORRENT_VERSION_MAJOR 1 #define LIBTORRENT_VERSION_MINOR 2 -#define LIBTORRENT_VERSION_TINY 14 +#define LIBTORRENT_VERSION_TINY 15 // the format of this version is: MMmmtt // M = Major version, m = minor version, t = tiny version #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY) -#define LIBTORRENT_VERSION "1.2.14.0" -#define LIBTORRENT_REVISION "2b4776a90" +#define LIBTORRENT_VERSION "1.2.15.0" +#define LIBTORRENT_REVISION "0facda852" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index db2c25b5687..c3cbc3c6794 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -124,7 +124,7 @@ constexpr int CLOSE_FILE_INTERVAL = 0; SET(proxy_username, "", &session_impl::update_proxy), SET(proxy_password, "", &session_impl::update_proxy), SET(i2p_hostname, "", &session_impl::update_i2p_bridge), - SET(peer_fingerprint, "-LT12E0-", nullptr), + SET(peer_fingerprint, "-LT12F0-", nullptr), SET(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes) }});