diff --git a/ChangeLog b/ChangeLog index 16f0ae692..f8fd081b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ + * force-proxy no longer disables DHT * improve connect-boost feature, to make new torrents quickly connect peers 1.1.9 release diff --git a/include/libtorrent/settings_pack.hpp b/include/libtorrent/settings_pack.hpp index b08cccff4..b14947fd8 100644 --- a/include/libtorrent/settings_pack.hpp +++ b/include/libtorrent/settings_pack.hpp @@ -609,9 +609,7 @@ namespace libtorrent // proxy_type and proxy_hostname settings. The listen sockets are // closed, and incoming connections will only be accepted through a // SOCKS5 or I2P proxy (if a peer proxy is set up and is run on the - // same machine as the tracker proxy). This setting also disabled peer - // country lookups, since those are done via DNS lookups that aren't - // supported by proxies. + // same machine as the tracker proxy). force_proxy, // if false, prevents libtorrent to advertise share-mode support diff --git a/src/session_impl.cpp b/src/session_impl.cpp index 698468794..49eb6e896 100644 --- a/src/session_impl.cpp +++ b/src/session_impl.cpp @@ -6526,9 +6526,6 @@ retry: stop_lsd(); stop_upnp(); stop_natpmp(); -#ifndef TORRENT_DISABLE_DHT - stop_dht(); -#endif } #ifndef TORRENT_NO_DEPRECATE