diff --git a/ChangeLog b/ChangeLog index 77f7d46c5..f7abad56e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.3 release + * promote errors in parsing listen_interfaces to post listen_failed_alert * fix bug in protocol encryption/obfuscation * fix buffer overflow in SOCKS5 UDP logic diff --git a/Jamfile b/Jamfile index 0b16cc191..8a39bf9ba 100644 --- a/Jamfile +++ b/Jamfile @@ -45,7 +45,7 @@ else : : $(boost-include-path) /usr/local/include ; } -VERSION = 1.2.2 ; +VERSION = 1.2.3 ; rule linking ( properties * ) { diff --git a/bindings/python/setup.py b/bindings/python/setup.py index bc427f363..c749de5db 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -179,7 +179,7 @@ else: setup( name='python-libtorrent', - version='1.2.2', + version='1.2.3', 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 dcfde6dfd..38382dbdf 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.2 +VERSION=1.2.3 tar xvzf libtorrent-rasterbar-${VERSION}.tar.gz cd libtorrent-rasterbar-${VERSION}/test diff --git a/configure.ac b/configure.ac index c66624eaa..2a0b0723c 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[1.2.2],[arvid@libtorrent.org], +AC_INIT([libtorrent-rasterbar],[1.2.3],[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 bc010e9e1..9bcca5d82 100644 --- a/docs/header.rst +++ b/docs/header.rst @@ -1,3 +1,3 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.2.2 +:Version: 1.2.3 diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index c0fe6a781..a59d76a99 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 2 +#define LIBTORRENT_VERSION_TINY 3 // 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.2.0" -#define LIBTORRENT_REVISION "b2c3b4dbf" +#define LIBTORRENT_VERSION "1.2.3.0" +#define LIBTORRENT_REVISION "922aefbd5" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index c92720808..abe36e8c9 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, "-LT1220-", nullptr), + SET(peer_fingerprint, "-LT1230-", nullptr), SET(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes) }});