Merge branch 'RC_1_1'

This commit is contained in:
arvidn 2016-01-18 20:51:37 -05:00
commit 2262a3dcaf
3 changed files with 4 additions and 2 deletions

View File

@ -1,3 +1,6 @@
1.1.0 release
* tracker response alerts from user initiated announces/scrapes are now
posted regardless of alert mask
* improve DHT performance when changing external IP (primarily affects

View File

@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY)
#define LIBTORRENT_VERSION "1.1.0.0"
#define LIBTORRENT_REVISION "4c0b00c"
#define LIBTORRENT_REVISION "7f05551"
namespace libtorrent {

View File

@ -1550,7 +1550,6 @@ namespace aux {
{
TORRENT_ASSERT(m_deferred_submit_disk_jobs);
m_deferred_submit_disk_jobs = false;
if (m_abort) return;
m_disk_thread.submit_jobs();
}