diff -Nru libtorrent-rasterbar-1.0.6/aclocal.m4 libtorrent-rasterbar-1.0.7/aclocal.m4
--- libtorrent-rasterbar-1.0.6/aclocal.m4	2015-07-30 04:11:45.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/aclocal.m4	2015-11-14 05:34:03.000000000 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,14 +51,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -644,7 +647,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -694,7 +697,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -733,7 +736,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -762,7 +765,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -809,7 +812,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1044,7 +1047,7 @@
 sys.exit(sys.hexversion < minverhex)"
   AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1063,7 +1066,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1144,7 +1147,7 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1204,7 +1207,7 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1232,7 +1235,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1251,7 +1254,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff -Nru libtorrent-rasterbar-1.0.6/bindings/Makefile.in libtorrent-rasterbar-1.0.7/bindings/Makefile.in
--- libtorrent-rasterbar-1.0.6/bindings/Makefile.in	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/Makefile.in	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -79,7 +89,6 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = bindings
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
 	$(top_srcdir)/m4/ax_boost_python.m4 \
@@ -95,6 +104,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -153,6 +163,7 @@
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -234,6 +245,7 @@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -353,7 +365,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign bindings/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -648,6 +659,8 @@
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/Jamfile libtorrent-rasterbar-1.0.7/bindings/python/Jamfile
--- libtorrent-rasterbar-1.0.6/bindings/python/Jamfile	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/Jamfile	2015-11-14 05:21:39.000000000 +0000
@@ -12,7 +12,7 @@
 feature visibility : default hidden : composite propagated link-incompatible ;
 feature.compose <visibility>hidden : <cflags>-fvisibility=hidden <cxxflags>-fvisibility-inlines-hidden ;
 
-feature libtorrent-link : static shared : ;
+feature libtorrent-link : shared static : composite propagated ;
 feature libtorrent-python-pic : off on : composite propagated link-incompatible ;
 feature.compose <libtorrent-python-pic>on : <cflags>-fPIC ;
 
@@ -99,7 +99,7 @@
         ] ;
 }
 
-my-python-extension libtorrent 
+my-python-extension libtorrent
   : # sources
     src/module.cpp
     src/big_number.cpp
@@ -124,11 +124,16 @@
   : # requirements
     <include>src
     <conditional>@libtorrent_linking
-  : # default build
-    <boost-link>static
-    <libtorrent-link>static
+  : # usage-requirements
+    <conditional>@libtorrent_linking
     <suppress-import-lib>false
   ;
 
-install stage_module : libtorrent : <location>. ;
+install stage_module
+  : libtorrent
+  : <location>.
+    <install-type>LIB
+  ;
+
+explicit stage_module ;
 
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/Makefile.in libtorrent-rasterbar-1.0.7/bindings/python/Makefile.in
--- libtorrent-rasterbar-1.0.6/bindings/python/Makefile.in	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/Makefile.in	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -79,8 +89,6 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = bindings/python
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/link_flags.in $(srcdir)/compile_flags.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
 	$(top_srcdir)/m4/ax_boost_python.m4 \
@@ -96,6 +104,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = link_flags compile_flags
 CONFIG_CLEAN_VPATH_FILES =
@@ -119,6 +128,8 @@
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/compile_flags.in \
+	$(srcdir)/link_flags.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -175,6 +186,7 @@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -323,7 +335,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bindings/python/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign bindings/python/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -507,6 +518,8 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags-am uninstall uninstall-am uninstall-local
 
+.PRECIOUS: Makefile
+
 
 @ENABLE_PYTHON_BINDING_TRUE@all-local:
 @ENABLE_PYTHON_BINDING_TRUE@	$(PYTHON) setup.py build
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/setup.py libtorrent-rasterbar-1.0.7/bindings/python/setup.py
--- libtorrent-rasterbar-1.0.6/bindings/python/setup.py	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/setup.py	2015-11-14 05:22:43.000000000 +0000
@@ -105,7 +105,7 @@
 		libraries = ['torrent-rasterbar'] + parse_cmd(extra_cmd, '-l'))]
 
 setup(name = 'python-libtorrent',
-	version = '1.0.6',
+	version = '1.0.7',
 	author = 'Arvid Norberg',
 	author_email = 'arvid@libtorrent.org',
 	description = 'Python bindings for libtorrent-rasterbar',
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/src/big_number.cpp libtorrent-rasterbar-1.0.7/bindings/python/src/big_number.cpp
--- libtorrent-rasterbar-1.0.6/bindings/python/src/big_number.cpp	2015-06-04 23:58:25.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/src/big_number.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -28,7 +28,7 @@
         .def(self != self)
         .def(self < self)
         .def(self_ns::str(self))
-        .def(init<char const*>())
+        .def(init<std::string>())
         .def("clear", &sha1_hash::clear)
         .def("is_all_zeros", &sha1_hash::is_all_zeros)
         .def("to_string", &sha1_hash::to_string)
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/src/create_torrent.cpp libtorrent-rasterbar-1.0.7/bindings/python/src/create_torrent.cpp
--- libtorrent-rasterbar-1.0.6/bindings/python/src/create_torrent.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/src/create_torrent.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -62,7 +62,7 @@
     char const* filestorage_name(file_storage const& fs)
     { return fs.name().c_str(); }
 
-    bool call_python_object2(boost::python::object const& obj, std::string& i)
+    bool call_python_object2(boost::python::object const& obj, std::string const& i)
     {
        return obj(i);
     }
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/src/session.cpp libtorrent-rasterbar-1.0.7/bindings/python/src/session.cpp
--- libtorrent-rasterbar-1.0.6/bindings/python/src/session.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/src/session.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -118,9 +118,9 @@
 			}
 		}
 
-		if (!sett_dict.has_key("outgoing_port"))
+		if (sett_dict.has_key("outgoing_port"))
 			sett.outgoing_ports.first = extract<int>(sett_dict["outgoing_port"]);
-		if (!sett_dict.has_key("num_outgoing_ports"))
+		if (sett_dict.has_key("num_outgoing_ports"))
 			sett.outgoing_ports.second = sett.outgoing_ports.first + extract<int>(sett_dict["num_outgoing_ports"]);
 
 		ses.set_settings(sett);
@@ -607,6 +607,7 @@
         .value("flag_super_seeding", add_torrent_params::flag_super_seeding)
         .value("flag_sequential_download", add_torrent_params::flag_sequential_download)
         .value("flag_use_resume_save_path", add_torrent_params::flag_use_resume_save_path)
+        .value("flag_merge_resume_http_seeds", add_torrent_params::flag_merge_resume_http_seeds)
     ;
     class_<cache_status>("cache_status")
         .def_readonly("blocks_written", &cache_status::blocks_written)
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/src/torrent_handle.cpp libtorrent-rasterbar-1.0.7/bindings/python/src/torrent_handle.cpp
--- libtorrent-rasterbar-1.0.6/bindings/python/src/torrent_handle.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/src/torrent_handle.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -6,6 +6,7 @@
 #include <boost/python/tuple.hpp>
 #include <libtorrent/torrent_handle.hpp>
 #include <libtorrent/peer_info.hpp>
+#include <libtorrent/storage.hpp>
 #include <boost/lexical_cast.hpp>
 #include "gil.hpp"
 
@@ -502,4 +503,10 @@
         .value("query_pieces", torrent_handle::query_pieces)
         .value("query_verified_pieces", torrent_handle::query_verified_pieces)
     ;
+
+    enum_<move_flags_t>("move_flags_t")
+        .value("always_replace_files", always_replace_files)
+        .value("fail_if_exist", fail_if_exist)
+        .value("dont_replace", dont_replace)
+    ;
 }
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/src/torrent_info.cpp libtorrent-rasterbar-1.0.7/bindings/python/src/torrent_info.cpp
--- libtorrent-rasterbar-1.0.6/bindings/python/src/torrent_info.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/src/torrent_info.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -149,8 +149,8 @@
        return result;
     }
 
-    bool get_tier(announce_entry const& ae) { return ae.tier; }
-    void set_tier(announce_entry& ae, bool v) { ae.tier = v; }
+    int get_tier(announce_entry const& ae) { return ae.tier; }
+    void set_tier(announce_entry& ae, int v) { ae.tier = v; }
     bool get_fail_limit(announce_entry const& ae) { return ae.fail_limit; }
     void set_fail_limit(announce_entry& ae, int l) { ae.fail_limit = l; }
     bool get_fails(announce_entry const& ae) { return ae.fails; }
diff -Nru libtorrent-rasterbar-1.0.6/bindings/python/src/version.cpp libtorrent-rasterbar-1.0.7/bindings/python/src/version.cpp
--- libtorrent-rasterbar-1.0.6/bindings/python/src/version.cpp	2015-06-04 23:58:25.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/bindings/python/src/version.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -6,11 +6,16 @@
 #include <boost/python.hpp>
 
 using namespace boost::python;
+using libtorrent::version;
 
 void bind_version()
 {
+    scope().attr("__version__") = version();
+
+#ifndef TORRENT_NO_DEPRECATE
     scope().attr("version") = LIBTORRENT_VERSION;
     scope().attr("version_major") = LIBTORRENT_VERSION_MAJOR;
     scope().attr("version_minor") = LIBTORRENT_VERSION_MINOR;
+#endif
 }
 
diff -Nru libtorrent-rasterbar-1.0.6/build-aux/compile libtorrent-rasterbar-1.0.7/build-aux/compile
--- libtorrent-rasterbar-1.0.6/build-aux/compile	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/build-aux/compile	2015-11-14 05:34:05.000000000 +0000
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff -Nru libtorrent-rasterbar-1.0.6/build-aux/config.guess libtorrent-rasterbar-1.0.7/build-aux/config.guess
--- libtorrent-rasterbar-1.0.6/build-aux/config.guess	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/build-aux/config.guess	2015-11-14 05:34:05.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-11-29'
+timestamp='2014-11-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -579,8 +579,9 @@
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -826,7 +827,7 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +970,10 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1371,154 +1372,6 @@
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff -Nru libtorrent-rasterbar-1.0.6/build-aux/config.sub libtorrent-rasterbar-1.0.7/build-aux/config.sub
--- libtorrent-rasterbar-1.0.6/build-aux/config.sub	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/build-aux/config.sub	2015-11-14 05:34:05.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-10-01'
+timestamp='2014-12-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -283,8 +283,10 @@
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -296,11 +298,11 @@
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -311,6 +313,7 @@
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -325,6 +328,9 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -402,8 +408,10 @@
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +423,7 @@
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -432,6 +441,7 @@
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -769,6 +779,9 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -824,6 +837,10 @@
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1369,14 +1386,14 @@
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1594,9 +1611,6 @@
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
diff -Nru libtorrent-rasterbar-1.0.6/build-aux/depcomp libtorrent-rasterbar-1.0.7/build-aux/depcomp
--- libtorrent-rasterbar-1.0.6/build-aux/depcomp	2015-07-30 04:11:48.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/build-aux/depcomp	2015-11-14 05:34:05.000000000 +0000
@@ -3,7 +3,7 @@
 
 scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff -Nru libtorrent-rasterbar-1.0.6/build-aux/install-sh libtorrent-rasterbar-1.0.7/build-aux/install-sh
--- libtorrent-rasterbar-1.0.6/build-aux/install-sh	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/build-aux/install-sh	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2013-12-25.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -269,41 +274,15 @@
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -314,74 +293,74 @@
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            if (umask $mkdir_umask &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/d" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -391,53 +370,51 @@
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
+        test X"$d" = X && continue
 
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -472,15 +449,12 @@
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -493,24 +467,24 @@
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
 
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
diff -Nru libtorrent-rasterbar-1.0.6/build-aux/ltmain.sh libtorrent-rasterbar-1.0.7/build-aux/ltmain.sh
--- libtorrent-rasterbar-1.0.6/build-aux/ltmain.sh	2015-07-30 04:11:41.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/build-aux/ltmain.sh	2015-11-14 05:34:00.000000000 +0000
@@ -2,11 +2,11 @@
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
 ##               by inline-source v2014-01-03.01
 
-# libtool (GNU libtool) 2.4.4
+# libtool (GNU libtool) 2.4.6
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.4
-package_revision=2.4.4
+VERSION=2.4.6
+package_revision=2.4.6
 
 
 ## ------ ##
@@ -64,12 +64,12 @@
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2014-01-03.01; # UTC
+scriptversion=2015-01-20.17; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -192,7 +192,7 @@
 
     _G_path_prog_max=0
     _G_path_prog_found=false
-    _G_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
     for _G_dir in $_G_PATH; do
       IFS=$_G_save_IFS
       test -z "$_G_dir" && _G_dir=.
@@ -1375,7 +1375,7 @@
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -1977,7 +1977,7 @@
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.4.4'
+scriptversion='(GNU libtool) 2.4.6'
 
 
 # func_echo ARG...
@@ -2039,7 +2039,12 @@
 "
 
 # Additional text appended to 'usage_message' in response to '--help'.
-long_help_message=$long_help_message"
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
 
 MODE must be one of the following:
 
@@ -2063,13 +2068,15 @@
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname (GNU libtool) 2.4.4
+       version:        $progname (GNU libtool) 2.4.6
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
 Report bugs to <bug-libtool@gnu.org>.
 GNU libtool home page: <http://www.gnu.org/software/libtool/>.
 General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
 
 
 # func_lo2o OBJECT-NAME
@@ -6461,6 +6468,24 @@
     esac
 }
 
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
@@ -7437,6 +7462,9 @@
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
     func_dirname "$output" "/" ""
     output_objdir=$func_dirname_result$objdir
     func_to_tool_file "$output_objdir/"
@@ -8599,6 +8627,37 @@
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
       # Last step: remove runtime libs from dependency_libs
       # (they stay in deplibs)
       tmp_libs=
diff -Nru libtorrent-rasterbar-1.0.6/build-aux/missing libtorrent-rasterbar-1.0.7/build-aux/missing
--- libtorrent-rasterbar-1.0.6/build-aux/missing	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/build-aux/missing	2015-11-14 05:34:05.000000000 +0000
@@ -3,7 +3,7 @@
 
 scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
diff -Nru libtorrent-rasterbar-1.0.6/build-aux/test-driver libtorrent-rasterbar-1.0.7/build-aux/test-driver
--- libtorrent-rasterbar-1.0.6/build-aux/test-driver	2015-07-30 04:11:48.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/build-aux/test-driver	2015-11-14 05:34:05.000000000 +0000
@@ -3,7 +3,7 @@
 
 scriptversion=2013-07-13.22; # UTC
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@
 # Test script is run here.
 "$@" >$log_file 2>&1
 estatus=$?
+
 if test $enable_hard_errors = no && test $estatus -eq 99; then
-  estatus=1
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
 fi
 
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
   0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
   0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
   77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
@@ -119,6 +122,12 @@
   *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
 esac
 
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
 
diff -Nru libtorrent-rasterbar-1.0.6/ChangeLog libtorrent-rasterbar-1.0.7/ChangeLog
--- libtorrent-rasterbar-1.0.6/ChangeLog	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/ChangeLog	2015-11-14 05:21:45.000000000 +0000
@@ -1,3 +1,27 @@
+1.0.7 release
+
+	* fix bug where loading settings via load_state() would not trigger all
+	  appropriate actions
+	* fix bug where 32 bit builds could use more disk cache than the virtual
+	  address space (when set to automatic)
+	* fix support for torrents with > 500'000 pieces
+	* fix ip filter bug when banning peers
+	* fix IPv6 IP address resolution in URLs
+	* introduce run-time check for torrent info-sections beeing too large
+	* fix web seed bug when using proxy and proxy-peer-connections=false
+	* fix bug in magnet link parser
+	* introduce add_torrent_params flags to merge web seeds with resume data
+	  (similar to trackers)
+	* fix bug where dont_count_slow_torrents could not be disabled
+	* fix fallocate hack on linux (fixes corruption on some architectures)
+	* fix auto-manage bug with announce to tracker/lsd/dht limits
+	* improve DHT routing table to not create an unbalanced tree
+	* fix bug in uTP that would cause any connection taking more than one second
+	  to connect be timed out (introduced in the vulnerability path)
+	* fixed falling back to sending UDP packets direct when socks proxy fails
+	* fixed total_wanted bug (when setting file priorities in add_torrent_params)
+	* fix python3 compatibility with sha1_hash
+
 1.0.6 release
 
 	* fixed uTP vulnerability
diff -Nru libtorrent-rasterbar-1.0.6/CMakeLists.txt libtorrent-rasterbar-1.0.7/CMakeLists.txt
--- libtorrent-rasterbar-1.0.6/CMakeLists.txt	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/CMakeLists.txt	2015-11-14 05:22:43.000000000 +0000
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(libtorrent)
 set (SOVERSION "8")
-set (VERSION "1.0.6")
+set (VERSION "1.0.7")
 
 set(sources
 	web_connection_base
diff -Nru libtorrent-rasterbar-1.0.6/configure libtorrent-rasterbar-1.0.7/configure
--- libtorrent-rasterbar-1.0.6/configure	2015-07-30 04:11:46.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/configure	2015-11-14 05:34:04.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libtorrent-rasterbar 1.0.6.
+# Generated by GNU Autoconf 2.69 for libtorrent-rasterbar 1.0.7.
 #
 # Report bugs to <arvid@libtorrent.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='libtorrent-rasterbar'
 PACKAGE_TARNAME='libtorrent-rasterbar'
-PACKAGE_VERSION='1.0.6'
-PACKAGE_STRING='libtorrent-rasterbar 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='libtorrent-rasterbar 1.0.7'
 PACKAGE_BUGREPORT='arvid@libtorrent.org'
 PACKAGE_URL='http://www.libtorrent.org'
 
@@ -681,6 +681,7 @@
 PTHREAD_LIBS
 PTHREAD_CC
 ax_pthread_config
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
@@ -855,6 +856,7 @@
 CXXFLAGS
 CCC
 CXXCPP
+LT_SYS_LIBRARY_PATH
 PKG_CONFIG
 PYTHON
 PYTHON_VERSION
@@ -1401,7 +1403,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libtorrent-rasterbar 1.0.6 to adapt to many kinds of systems.
+\`configure' configures libtorrent-rasterbar 1.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1473,7 +1475,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libtorrent-rasterbar 1.0.6:";;
+     short | recursive ) echo "Configuration of libtorrent-rasterbar 1.0.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1566,6 +1568,8 @@
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
   PKG_CONFIG  path to pkg-config utility
   PYTHON      the Python interpreter
   PYTHON_VERSION
@@ -1645,7 +1649,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libtorrent-rasterbar configure 1.0.6
+libtorrent-rasterbar configure 1.0.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2135,7 +2139,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libtorrent-rasterbar $as_me 1.0.6, which was
+It was created by libtorrent-rasterbar $as_me 1.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3370,8 +3374,8 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4251,7 +4255,7 @@
 
 $as_echo
 $as_echo  "Initializing Automake:"
-am__api_version='1.14'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -4440,7 +4444,7 @@
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4758,7 +4762,7 @@
 
 # Define the identity of the package.
  PACKAGE='libtorrent-rasterbar'
- VERSION='1.0.6'
+ VERSION='1.0.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4792,8 +4796,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -5108,6 +5112,7 @@
 fi
 
 
+
 $as_echo
 $as_echo  "Initializing Libtool:"
 
@@ -5119,8 +5124,8 @@
 
 
 
-macro_version='2.4.4'
-macro_revision='2.4.4'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -7472,6 +7477,21 @@
 
 
 
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
@@ -8479,6 +8499,41 @@
     ;;
   esac
 
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
@@ -8940,15 +8995,8 @@
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
@@ -11407,6 +11455,8 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
   version_type=linux # correct to gnu/linux during the next big refactor
@@ -11695,6 +11745,7 @@
   case $version_type in
     freebsd-elf*)
       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -11754,10 +11805,11 @@
     soname_spec='$libname$release$shared_ext$major'
     if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -11909,7 +11961,12 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -12134,10 +12191,25 @@
 if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
   sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
+
 if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
   sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
 
 
 
@@ -13136,15 +13208,8 @@
   CFLAGS=$CXXFLAGS
   compiler=$CC
   compiler_CXX=$CC
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+  func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
   if test -n "$compiler"; then
@@ -14531,51 +14596,6 @@
   postdep_objects_CXX=
   postdeps_CXX=
   ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test yes != "$solaris_use_stlport4"; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test yes != "$solaris_use_stlport4"; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
 esac
 
 
@@ -15399,6 +15419,8 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
   version_type=linux # correct to gnu/linux during the next big refactor
@@ -15685,6 +15707,7 @@
   case $version_type in
     freebsd-elf*)
       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -15744,10 +15767,11 @@
     soname_spec='$libname$release$shared_ext$major'
     if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -15899,7 +15923,12 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -16124,10 +16153,22 @@
 if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
   sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
+
 if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
   sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
 
 
 
@@ -21106,7 +21147,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libtorrent-rasterbar $as_me 1.0.6, which was
+This file was extended by libtorrent-rasterbar $as_me 1.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21164,7 +21205,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libtorrent-rasterbar config.status 1.0.6
+libtorrent-rasterbar config.status 1.0.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -21409,7 +21450,8 @@
 finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
 hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
 sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
 hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
 enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -21612,7 +21654,8 @@
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
 reload_cmds_CXX \
 old_archive_cmds_CXX \
 old_archive_from_new_cmds_CXX \
@@ -22244,6 +22287,9 @@
 # The names of the tagged configurations supported by this script.
 available_tags='CXX '
 
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
 # ### BEGIN LIBTOOL CONFIG
 
 # Which release of libtool.m4 was used?
@@ -22493,8 +22539,11 @@
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -22659,6 +22708,65 @@
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
diff -Nru libtorrent-rasterbar-1.0.6/configure.ac libtorrent-rasterbar-1.0.7/configure.ac
--- libtorrent-rasterbar-1.0.6/configure.ac	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/configure.ac	2015-11-14 05:22:43.000000000 +0000
@@ -5,7 +5,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libtorrent-rasterbar],[1.0.6],[arvid@libtorrent.org],
+AC_INIT([libtorrent-rasterbar],[1.0.7],[arvid@libtorrent.org],
         [libtorrent-rasterbar],[http://www.libtorrent.org])
 AC_CONFIG_SRCDIR([src/torrent.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
diff -Nru libtorrent-rasterbar-1.0.6/debian/changelog libtorrent-rasterbar-1.0.7/debian/changelog
--- libtorrent-rasterbar-1.0.6/debian/changelog	2015-08-29 16:55:13.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/debian/changelog	2015-11-27 17:41:46.000000000 +0000
@@ -1,3 +1,12 @@
+libtorrent-rasterbar (1.0.7-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #806396).
+  * Update Source link in debian/copyright.
+  * debian/patches/missing_rst_file.patch: Add file missing
+    from upstream distribution.
+
+ -- Andrew Starr-Bochicchio <asb@debian.org>  Fri, 27 Nov 2015 12:41:42 -0500
+
 libtorrent-rasterbar (1.0.6-2) unstable; urgency=medium
 
   * Upload to unstable (Closes: #791176).
diff -Nru libtorrent-rasterbar-1.0.6/debian/copyright libtorrent-rasterbar-1.0.7/debian/copyright
--- libtorrent-rasterbar-1.0.6/debian/copyright	2015-08-29 16:50:48.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/debian/copyright	2015-11-27 16:28:54.000000000 +0000
@@ -3,7 +3,7 @@
 Packaged-Date: Wed, 02 Jul 2008 10:46:21 +0200
 Upstream-Name: libtorrent
 Upstream-Contact: Arvid Norberg <arvid@rasterbar.com>
-Source: http://code.google.com/p/libtorrent/downloads/list
+Source: https://github.com/arvidn/libtorrent/releases
 
 
 Files: debian/*
diff -Nru libtorrent-rasterbar-1.0.6/debian/patches/fix-html-docs.patch libtorrent-rasterbar-1.0.7/debian/patches/fix-html-docs.patch
--- libtorrent-rasterbar-1.0.6/debian/patches/fix-html-docs.patch	2015-08-29 16:50:48.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/debian/patches/fix-html-docs.patch	2015-11-27 16:24:19.000000000 +0000
@@ -8,7 +8,7 @@
 Index: libtorrent-rasterbar/docs/template.txt
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libtorrent-rasterbar/docs/template.txt	2015-08-01 18:36:09.475763177 -0400
++++ libtorrent-rasterbar/docs/template.txt	2015-11-27 11:23:06.910039791 -0500
 @@ -0,0 +1,29 @@
 +%(head_prefix)s
 +%(head)s
@@ -42,7 +42,7 @@
 Index: libtorrent-rasterbar/docs/makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libtorrent-rasterbar/docs/makefile	2015-08-01 18:36:09.475763177 -0400
++++ libtorrent-rasterbar/docs/makefile	2015-11-27 11:23:06.910039791 -0500
 @@ -0,0 +1,34 @@
 +#!/usr/bin/make -f
 +# Upstream Author: Arvid Norberg - Modified by: Cristian Greco
@@ -81,7 +81,7 @@
 Index: libtorrent-rasterbar/docs/css/base.css
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libtorrent-rasterbar/docs/css/base.css	2015-08-01 18:36:09.499763574 -0400
++++ libtorrent-rasterbar/docs/css/base.css	2015-11-27 11:23:06.910039791 -0500
 @@ -0,0 +1,136 @@
 +/* Page template */
 +
@@ -222,7 +222,7 @@
 Index: libtorrent-rasterbar/docs/css/rst.css
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libtorrent-rasterbar/docs/css/rst.css	2015-08-01 18:36:09.499763574 -0400
++++ libtorrent-rasterbar/docs/css/rst.css	2015-11-27 11:23:06.910039791 -0500
 @@ -0,0 +1,245 @@
 +.document {
 +    margin-left: 10px;
@@ -471,8 +471,8 @@
 +
 Index: libtorrent-rasterbar/docs/index.rst
 ===================================================================
---- libtorrent-rasterbar.orig/docs/index.rst	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/index.rst	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/index.rst	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/index.rst	2015-11-27 11:23:06.910039791 -0500
 @@ -88,7 +88,7 @@
  .. _`ruby bindings`: http://libtorrent-ruby.rubyforge.org/
  .. _`python bindings`: python_binding.html
@@ -498,25 +498,10 @@
  
  
  Feedback
-@@ -157,13 +153,10 @@
- 
- __ http://www.cs.umu.se
- 
--Project is hosted by sourceforge.
--
--|sf_logo|__
-+`Project is hosted by sourceforge.`__
- 
- __ http://sourceforge.net
- 
--.. |sf_logo| image:: http://sourceforge.net/sflogo.php?group_id=7994
- .. |copy| unicode:: 0xA9 .. copyright sign
- 
- .. raw:: html
 Index: libtorrent-rasterbar/docs/reference-Alerts.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Alerts.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Alerts.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Alerts.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Alerts.html	2015-11-27 11:23:06.910039791 -0500
 @@ -7,17 +7,6 @@
  <title>Alerts</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -537,8 +522,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Bencoding.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Bencoding.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Bencoding.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Bencoding.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Bencoding.html	2015-11-27 11:23:06.910039791 -0500
 @@ -7,17 +7,6 @@
  <title>Bencoding</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -559,8 +544,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Core.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Core.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Core.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Core.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Core.html	2015-11-27 11:23:06.910039791 -0500
 @@ -7,17 +7,6 @@
  <title>Core</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -581,8 +566,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Create_Torrents.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Create_Torrents.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Create_Torrents.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Create_Torrents.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Create_Torrents.html	2015-11-27 11:23:06.910039791 -0500
 @@ -7,17 +7,6 @@
  <title>Create Torrents</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -603,8 +588,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Custom_Storage.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Custom_Storage.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Custom_Storage.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Custom_Storage.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Custom_Storage.html	2015-11-27 11:23:06.910039791 -0500
 @@ -7,17 +7,6 @@
  <title>Custom Storage</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -625,8 +610,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Error_Codes.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Error_Codes.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Error_Codes.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Error_Codes.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Error_Codes.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>Error Codes</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -647,8 +632,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Plugins.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Plugins.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Plugins.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Plugins.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Plugins.html	2015-11-27 11:23:06.914039868 -0500
 @@ -6,17 +6,6 @@
  <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
  <title></title>
@@ -669,8 +654,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-RSS.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-RSS.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-RSS.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-RSS.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-RSS.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>RSS</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -691,8 +676,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Session.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Session.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Session.html	2015-08-01 18:36:09.499763574 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Session.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Session.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>Session</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -713,8 +698,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Settings.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Settings.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Settings.html	2015-08-01 18:36:09.503763640 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Settings.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Settings.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>Settings</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -735,8 +720,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Storage.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Storage.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Storage.html	2015-08-01 18:36:09.503763640 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Storage.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Storage.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>Storage</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -757,8 +742,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-String.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-String.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-String.html	2015-08-01 18:36:09.503763640 -0400
+--- libtorrent-rasterbar.orig/docs/reference-String.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-String.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>String</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -779,8 +764,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Time.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Time.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Time.html	2015-08-01 18:36:09.503763640 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Time.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Time.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>Time</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -801,8 +786,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Utility.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Utility.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Utility.html	2015-08-01 18:36:09.503763640 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Utility.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Utility.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>Utility</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -823,8 +808,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference.html	2015-08-01 18:36:09.503763640 -0400
+--- libtorrent-rasterbar.orig/docs/reference.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference.html	2015-11-27 11:23:06.914039868 -0500
 @@ -6,17 +6,6 @@
  <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
  <title>libtorrent reference documentation</title>
@@ -845,8 +830,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/reference-Filter.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/reference-Filter.html	2015-08-01 18:36:09.503763640 -0400
-+++ libtorrent-rasterbar/docs/reference-Filter.html	2015-08-01 18:36:09.503763640 -0400
+--- libtorrent-rasterbar.orig/docs/reference-Filter.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/reference-Filter.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>Filter</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
@@ -867,8 +852,8 @@
  <style type="text/css">
 Index: libtorrent-rasterbar/docs/hacking.html
 ===================================================================
---- libtorrent-rasterbar.orig/docs/hacking.html	2015-08-01 17:58:41.661996281 -0400
-+++ libtorrent-rasterbar/docs/hacking.html	2015-08-01 18:37:09.228750497 -0400
+--- libtorrent-rasterbar.orig/docs/hacking.html	2015-11-27 11:23:06.914039868 -0500
++++ libtorrent-rasterbar/docs/hacking.html	2015-11-27 11:23:06.914039868 -0500
 @@ -7,17 +7,6 @@
  <title>libtorrent hacking</title>
  <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
diff -Nru libtorrent-rasterbar-1.0.6/debian/patches/missing_rst_file.patch libtorrent-rasterbar-1.0.7/debian/patches/missing_rst_file.patch
--- libtorrent-rasterbar-1.0.6/debian/patches/missing_rst_file.patch	1970-01-01 00:00:00.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/debian/patches/missing_rst_file.patch	2015-11-27 17:39:55.000000000 +0000
@@ -0,0 +1,2010 @@
+Index: libtorrent-rasterbar/docs/stats_counters.rst
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libtorrent-rasterbar/docs/stats_counters.rst	2015-11-27 12:39:47.613512180 -0500
+@@ -0,0 +1,2005 @@
++.. _peer.error_peers:
++
++.. _peer.disconnected_peers:
++
++.. raw:: html
++
++	<a name="peer.error_peers"></a>
++	<a name="peer.disconnected_peers"></a>
++
+++-------------------------+---------+
++| name                    | type    |
+++=========================+=========+
++| peer.error_peers        | counter |
+++-------------------------+---------+
++| peer.disconnected_peers | counter |
+++-------------------------+---------+
++
++
++``error_peers`` is the total number of peer disconnects
++caused by an error (not initiated by this client) and
++disconnected initiated by this client (``disconnected_peers``).
++
++.. _peer.eof_peers:
++
++.. _peer.connreset_peers:
++
++.. _peer.connrefused_peers:
++
++.. _peer.connaborted_peers:
++
++.. _peer.notconnected_peers:
++
++.. _peer.perm_peers:
++
++.. _peer.buffer_peers:
++
++.. _peer.unreachable_peers:
++
++.. _peer.broken_pipe_peers:
++
++.. _peer.addrinuse_peers:
++
++.. _peer.no_access_peers:
++
++.. _peer.invalid_arg_peers:
++
++.. _peer.aborted_peers:
++
++.. raw:: html
++
++	<a name="peer.eof_peers"></a>
++	<a name="peer.connreset_peers"></a>
++	<a name="peer.connrefused_peers"></a>
++	<a name="peer.connaborted_peers"></a>
++	<a name="peer.notconnected_peers"></a>
++	<a name="peer.perm_peers"></a>
++	<a name="peer.buffer_peers"></a>
++	<a name="peer.unreachable_peers"></a>
++	<a name="peer.broken_pipe_peers"></a>
++	<a name="peer.addrinuse_peers"></a>
++	<a name="peer.no_access_peers"></a>
++	<a name="peer.invalid_arg_peers"></a>
++	<a name="peer.aborted_peers"></a>
++
+++-------------------------+---------+
++| name                    | type    |
+++=========================+=========+
++| peer.eof_peers          | counter |
+++-------------------------+---------+
++| peer.connreset_peers    | counter |
+++-------------------------+---------+
++| peer.connrefused_peers  | counter |
+++-------------------------+---------+
++| peer.connaborted_peers  | counter |
+++-------------------------+---------+
++| peer.notconnected_peers | counter |
+++-------------------------+---------+
++| peer.perm_peers         | counter |
+++-------------------------+---------+
++| peer.buffer_peers       | counter |
+++-------------------------+---------+
++| peer.unreachable_peers  | counter |
+++-------------------------+---------+
++| peer.broken_pipe_peers  | counter |
+++-------------------------+---------+
++| peer.addrinuse_peers    | counter |
+++-------------------------+---------+
++| peer.no_access_peers    | counter |
+++-------------------------+---------+
++| peer.invalid_arg_peers  | counter |
+++-------------------------+---------+
++| peer.aborted_peers      | counter |
+++-------------------------+---------+
++
++
++these counters break down the peer errors into more specific
++categories. These errors are what the underlying transport
++reported (i.e. TCP or uTP)
++
++.. _peer.piece_requests:
++
++.. _peer.max_piece_requests:
++
++.. _peer.invalid_piece_requests:
++
++.. _peer.choked_piece_requests:
++
++.. _peer.cancelled_piece_requests:
++
++.. _peer.piece_rejects:
++
++.. raw:: html
++
++	<a name="peer.piece_requests"></a>
++	<a name="peer.max_piece_requests"></a>
++	<a name="peer.invalid_piece_requests"></a>
++	<a name="peer.choked_piece_requests"></a>
++	<a name="peer.cancelled_piece_requests"></a>
++	<a name="peer.piece_rejects"></a>
++
+++-------------------------------+---------+
++| name                          | type    |
+++===============================+=========+
++| peer.piece_requests           | counter |
+++-------------------------------+---------+
++| peer.max_piece_requests       | counter |
+++-------------------------------+---------+
++| peer.invalid_piece_requests   | counter |
+++-------------------------------+---------+
++| peer.choked_piece_requests    | counter |
+++-------------------------------+---------+
++| peer.cancelled_piece_requests | counter |
+++-------------------------------+---------+
++| peer.piece_rejects            | counter |
+++-------------------------------+---------+
++
++
++the total number of incoming piece requests we've received followed
++by the number of rejected piece requests for various reasons.
++max_piece_requests mean we already had too many outstanding requests
++from this peer, so we rejected it. cancelled_piece_requests are ones
++where the other end explicitly asked for the piece to be rejected.
++
++.. _peer.error_incoming_peers:
++
++.. _peer.error_outgoing_peers:
++
++.. raw:: html
++
++	<a name="peer.error_incoming_peers"></a>
++	<a name="peer.error_outgoing_peers"></a>
++
+++---------------------------+---------+
++| name                      | type    |
+++===========================+=========+
++| peer.error_incoming_peers | counter |
+++---------------------------+---------+
++| peer.error_outgoing_peers | counter |
+++---------------------------+---------+
++
++
++these counters break down the peer errors into
++whether they happen on incoming or outgoing peers.
++
++.. _peer.error_rc4_peers:
++
++.. _peer.error_encrypted_peers:
++
++.. raw:: html
++
++	<a name="peer.error_rc4_peers"></a>
++	<a name="peer.error_encrypted_peers"></a>
++
+++----------------------------+---------+
++| name                       | type    |
+++============================+=========+
++| peer.error_rc4_peers       | counter |
+++----------------------------+---------+
++| peer.error_encrypted_peers | counter |
+++----------------------------+---------+
++
++
++these counters break down the peer errors into
++whether they happen on encrypted peers (just
++encrypted handshake) and rc4 peers (full stream
++encryption). These can indicate whether encrypted
++peers are more or less likely to fail
++
++.. _peer.error_tcp_peers:
++
++.. _peer.error_utp_peers:
++
++.. raw:: html
++
++	<a name="peer.error_tcp_peers"></a>
++	<a name="peer.error_utp_peers"></a>
++
+++----------------------+---------+
++| name                 | type    |
+++======================+=========+
++| peer.error_tcp_peers | counter |
+++----------------------+---------+
++| peer.error_utp_peers | counter |
+++----------------------+---------+
++
++
++these counters break down the peer errors into
++whether they happen on uTP peers or TCP peers.
++these may indicate whether one protocol is
++more error prone
++
++.. _peer.connect_timeouts:
++
++.. _peer.uninteresting_peers:
++
++.. _peer.timeout_peers:
++
++.. _peer.no_memory_peers:
++
++.. _peer.too_many_peers:
++
++.. _peer.transport_timeout_peers:
++
++.. _peer.num_banned_peers:
++
++.. _peer.banned_for_hash_failure:
++
++.. _peer.connection_attempts:
++
++.. _peer.connection_attempt_loops:
++
++.. _peer.incoming_connections:
++
++.. raw:: html
++
++	<a name="peer.connect_timeouts"></a>
++	<a name="peer.uninteresting_peers"></a>
++	<a name="peer.timeout_peers"></a>
++	<a name="peer.no_memory_peers"></a>
++	<a name="peer.too_many_peers"></a>
++	<a name="peer.transport_timeout_peers"></a>
++	<a name="peer.num_banned_peers"></a>
++	<a name="peer.banned_for_hash_failure"></a>
++	<a name="peer.connection_attempts"></a>
++	<a name="peer.connection_attempt_loops"></a>
++	<a name="peer.incoming_connections"></a>
++
+++-------------------------------+---------+
++| name                          | type    |
+++===============================+=========+
++| peer.connect_timeouts         | counter |
+++-------------------------------+---------+
++| peer.uninteresting_peers      | counter |
+++-------------------------------+---------+
++| peer.timeout_peers            | counter |
+++-------------------------------+---------+
++| peer.no_memory_peers          | counter |
+++-------------------------------+---------+
++| peer.too_many_peers           | counter |
+++-------------------------------+---------+
++| peer.transport_timeout_peers  | counter |
+++-------------------------------+---------+
++| peer.num_banned_peers         | counter |
+++-------------------------------+---------+
++| peer.banned_for_hash_failure  | counter |
+++-------------------------------+---------+
++| peer.connection_attempts      | counter |
+++-------------------------------+---------+
++| peer.connection_attempt_loops | counter |
+++-------------------------------+---------+
++| peer.incoming_connections     | counter |
+++-------------------------------+---------+
++
++
++these counters break down the reasons to
++disconnect peers.
++
++.. _peer.num_tcp_peers:
++
++.. _peer.num_socks5_peers:
++
++.. _peer.num_http_proxy_peers:
++
++.. _peer.num_utp_peers:
++
++.. _peer.num_i2p_peers:
++
++.. _peer.num_ssl_peers:
++
++.. _peer.num_ssl_socks5_peers:
++
++.. _peer.num_ssl_http_proxy_peers:
++
++.. _peer.num_ssl_utp_peers:
++
++.. _peer.num_peers_half_open:
++
++.. _peer.num_peers_connected:
++
++.. _peer.num_peers_up_interested:
++
++.. _peer.num_peers_down_interested:
++
++.. _peer.num_peers_up_unchoked_all:
++
++.. _peer.num_peers_up_unchoked_optimistic:
++
++.. _peer.num_peers_up_unchoked:
++
++.. _peer.num_peers_down_unchoked:
++
++.. _peer.num_peers_up_requests:
++
++.. _peer.num_peers_down_requests:
++
++.. _peer.num_peers_end_game:
++
++.. _peer.num_peers_up_disk:
++
++.. _peer.num_peers_down_disk:
++
++.. raw:: html
++
++	<a name="peer.num_tcp_peers"></a>
++	<a name="peer.num_socks5_peers"></a>
++	<a name="peer.num_http_proxy_peers"></a>
++	<a name="peer.num_utp_peers"></a>
++	<a name="peer.num_i2p_peers"></a>
++	<a name="peer.num_ssl_peers"></a>
++	<a name="peer.num_ssl_socks5_peers"></a>
++	<a name="peer.num_ssl_http_proxy_peers"></a>
++	<a name="peer.num_ssl_utp_peers"></a>
++	<a name="peer.num_peers_half_open"></a>
++	<a name="peer.num_peers_connected"></a>
++	<a name="peer.num_peers_up_interested"></a>
++	<a name="peer.num_peers_down_interested"></a>
++	<a name="peer.num_peers_up_unchoked_all"></a>
++	<a name="peer.num_peers_up_unchoked_optimistic"></a>
++	<a name="peer.num_peers_up_unchoked"></a>
++	<a name="peer.num_peers_down_unchoked"></a>
++	<a name="peer.num_peers_up_requests"></a>
++	<a name="peer.num_peers_down_requests"></a>
++	<a name="peer.num_peers_end_game"></a>
++	<a name="peer.num_peers_up_disk"></a>
++	<a name="peer.num_peers_down_disk"></a>
++
+++---------------------------------------+---------+
++| name                                  | type    |
+++=======================================+=========+
++| peer.num_tcp_peers                    | counter |
+++---------------------------------------+---------+
++| peer.num_socks5_peers                 | counter |
+++---------------------------------------+---------+
++| peer.num_http_proxy_peers             | counter |
+++---------------------------------------+---------+
++| peer.num_utp_peers                    | counter |
+++---------------------------------------+---------+
++| peer.num_i2p_peers                    | counter |
+++---------------------------------------+---------+
++| peer.num_ssl_peers                    | counter |
+++---------------------------------------+---------+
++| peer.num_ssl_socks5_peers             | counter |
+++---------------------------------------+---------+
++| peer.num_ssl_http_proxy_peers         | counter |
+++---------------------------------------+---------+
++| peer.num_ssl_utp_peers                | counter |
+++---------------------------------------+---------+
++| peer.num_peers_half_open              | counter |
+++---------------------------------------+---------+
++| peer.num_peers_connected              | counter |
+++---------------------------------------+---------+
++| peer.num_peers_up_interested          | counter |
+++---------------------------------------+---------+
++| peer.num_peers_down_interested        | counter |
+++---------------------------------------+---------+
++| peer.num_peers_up_unchoked_all        | counter |
+++---------------------------------------+---------+
++| peer.num_peers_up_unchoked_optimistic | counter |
+++---------------------------------------+---------+
++| peer.num_peers_up_unchoked            | counter |
+++---------------------------------------+---------+
++| peer.num_peers_down_unchoked          | counter |
+++---------------------------------------+---------+
++| peer.num_peers_up_requests            | counter |
+++---------------------------------------+---------+
++| peer.num_peers_down_requests          | counter |
+++---------------------------------------+---------+
++| peer.num_peers_end_game               | counter |
+++---------------------------------------+---------+
++| peer.num_peers_up_disk                | counter |
+++---------------------------------------+---------+
++| peer.num_peers_down_disk              | counter |
+++---------------------------------------+---------+
++
++
++the number of peer connections for each kind of socket.
++these counts include half-open (connecting) peers.
++``num_peers_up_unchoked_all`` is the total number of unchoked peers,
++whereas ``num_peers_up_unchoked`` only are unchoked peers that count
++against the limit (i.e. excluding peers that are unchoked because the
++limit doesn't apply to them). ``num_peers_up_unchoked_optimistic`` is
++the number of optimistically unchoked peers.
++
++.. _net.on_read_counter:
++
++.. _net.on_write_counter:
++
++.. _net.on_tick_counter:
++
++.. _net.on_lsd_counter:
++
++.. _net.on_lsd_peer_counter:
++
++.. _net.on_udp_counter:
++
++.. _net.on_accept_counter:
++
++.. _net.on_disk_counter:
++
++.. raw:: html
++
++	<a name="net.on_read_counter"></a>
++	<a name="net.on_write_counter"></a>
++	<a name="net.on_tick_counter"></a>
++	<a name="net.on_lsd_counter"></a>
++	<a name="net.on_lsd_peer_counter"></a>
++	<a name="net.on_udp_counter"></a>
++	<a name="net.on_accept_counter"></a>
++	<a name="net.on_disk_counter"></a>
++
+++-------------------------+---------+
++| name                    | type    |
+++=========================+=========+
++| net.on_read_counter     | counter |
+++-------------------------+---------+
++| net.on_write_counter    | counter |
+++-------------------------+---------+
++| net.on_tick_counter     | counter |
+++-------------------------+---------+
++| net.on_lsd_counter      | counter |
+++-------------------------+---------+
++| net.on_lsd_peer_counter | counter |
+++-------------------------+---------+
++| net.on_udp_counter      | counter |
+++-------------------------+---------+
++| net.on_accept_counter   | counter |
+++-------------------------+---------+
++| net.on_disk_counter     | counter |
+++-------------------------+---------+
++
++
++These counters count the number of times the
++network thread wakes up for each respective
++reason. If these counters are very large, it
++may indicate a performance issue, causing the
++network thread to wake up too ofte, wasting CPU.
++mitigate it by increasing buffers and limits
++for the specific trigger that wakes up the
++thread.
++
++.. _net.sent_payload_bytes:
++
++.. _net.sent_bytes:
++
++.. _net.sent_ip_overhead_bytes:
++
++.. _net.sent_tracker_bytes:
++
++.. _net.recv_payload_bytes:
++
++.. _net.recv_bytes:
++
++.. _net.recv_ip_overhead_bytes:
++
++.. _net.recv_tracker_bytes:
++
++.. raw:: html
++
++	<a name="net.sent_payload_bytes"></a>
++	<a name="net.sent_bytes"></a>
++	<a name="net.sent_ip_overhead_bytes"></a>
++	<a name="net.sent_tracker_bytes"></a>
++	<a name="net.recv_payload_bytes"></a>
++	<a name="net.recv_bytes"></a>
++	<a name="net.recv_ip_overhead_bytes"></a>
++	<a name="net.recv_tracker_bytes"></a>
++
+++----------------------------+---------+
++| name                       | type    |
+++============================+=========+
++| net.sent_payload_bytes     | counter |
+++----------------------------+---------+
++| net.sent_bytes             | counter |
+++----------------------------+---------+
++| net.sent_ip_overhead_bytes | counter |
+++----------------------------+---------+
++| net.sent_tracker_bytes     | counter |
+++----------------------------+---------+
++| net.recv_payload_bytes     | counter |
+++----------------------------+---------+
++| net.recv_bytes             | counter |
+++----------------------------+---------+
++| net.recv_ip_overhead_bytes | counter |
+++----------------------------+---------+
++| net.recv_tracker_bytes     | counter |
+++----------------------------+---------+
++
++
++total number of bytes sent and received by the session
++
++.. _net.limiter_up_queue:
++
++.. _net.limiter_down_queue:
++
++.. raw:: html
++
++	<a name="net.limiter_up_queue"></a>
++	<a name="net.limiter_down_queue"></a>
++
+++------------------------+---------+
++| name                   | type    |
+++========================+=========+
++| net.limiter_up_queue   | counter |
+++------------------------+---------+
++| net.limiter_down_queue | counter |
+++------------------------+---------+
++
++
++the number of sockets currently waiting for upload and download
++bandwidht from the rate limiter.
++
++.. _net.limiter_up_bytes:
++
++.. _net.limiter_down_bytes:
++
++.. raw:: html
++
++	<a name="net.limiter_up_bytes"></a>
++	<a name="net.limiter_down_bytes"></a>
++
+++------------------------+---------+
++| name                   | type    |
+++========================+=========+
++| net.limiter_up_bytes   | counter |
+++------------------------+---------+
++| net.limiter_down_bytes | counter |
+++------------------------+---------+
++
++
++the number of upload and download bytes waiting to be handed out from
++the rate limiter.
++
++.. _net.recv_failed_bytes:
++
++.. raw:: html
++
++	<a name="net.recv_failed_bytes"></a>
++
+++-----------------------+---------+
++| name                  | type    |
+++=======================+=========+
++| net.recv_failed_bytes | counter |
+++-----------------------+---------+
++
++
++the number of bytes downloaded that had to be discarded because they
++failed the hash check
++
++.. _net.recv_redundant_bytes:
++
++.. raw:: html
++
++	<a name="net.recv_redundant_bytes"></a>
++
+++--------------------------+---------+
++| name                     | type    |
+++==========================+=========+
++| net.recv_redundant_bytes | counter |
+++--------------------------+---------+
++
++
++the number of downloaded bytes that were discarded because they
++were downloaded multiple times (from different peers)
++
++.. _net.has_incoming_connections:
++
++.. raw:: html
++
++	<a name="net.has_incoming_connections"></a>
++
+++------------------------------+---------+
++| name                         | type    |
+++==============================+=========+
++| net.has_incoming_connections | counter |
+++------------------------------+---------+
++
++
++is false by default and set to true when
++the first incoming connection is established
++this is used to know if the client is behind
++NAT or not.
++
++.. _ses.num_checking_torrents:
++
++.. _ses.num_stopped_torrents:
++
++.. _ses.num_upload_only_torrents:
++
++.. _ses.num_downloading_torrents:
++
++.. _ses.num_seeding_torrents:
++
++.. _ses.num_queued_seeding_torrents:
++
++.. _ses.num_queued_download_torrents:
++
++.. _ses.num_error_torrents:
++
++.. raw:: html
++
++	<a name="ses.num_checking_torrents"></a>
++	<a name="ses.num_stopped_torrents"></a>
++	<a name="ses.num_upload_only_torrents"></a>
++	<a name="ses.num_downloading_torrents"></a>
++	<a name="ses.num_seeding_torrents"></a>
++	<a name="ses.num_queued_seeding_torrents"></a>
++	<a name="ses.num_queued_download_torrents"></a>
++	<a name="ses.num_error_torrents"></a>
++
+++----------------------------------+---------+
++| name                             | type    |
+++==================================+=========+
++| ses.num_checking_torrents        | counter |
+++----------------------------------+---------+
++| ses.num_stopped_torrents         | counter |
+++----------------------------------+---------+
++| ses.num_upload_only_torrents     | counter |
+++----------------------------------+---------+
++| ses.num_downloading_torrents     | counter |
+++----------------------------------+---------+
++| ses.num_seeding_torrents         | counter |
+++----------------------------------+---------+
++| ses.num_queued_seeding_torrents  | counter |
+++----------------------------------+---------+
++| ses.num_queued_download_torrents | counter |
+++----------------------------------+---------+
++| ses.num_error_torrents           | counter |
+++----------------------------------+---------+
++
++
++these gauges count the number of torrents in
++different states. Each torrent only belongs to
++one of these states. For torrents that could
++belong to multiple of these, the most prominent
++in picked. For instance, a torrent with an error
++counts as an error-torrent, regardless of its other
++state.
++
++.. _ses.num_loaded_torrents:
++
++.. _ses.num_pinned_torrents:
++
++.. raw:: html
++
++	<a name="ses.num_loaded_torrents"></a>
++	<a name="ses.num_pinned_torrents"></a>
++
+++-------------------------+---------+
++| name                    | type    |
+++=========================+=========+
++| ses.num_loaded_torrents | counter |
+++-------------------------+---------+
++| ses.num_pinned_torrents | counter |
+++-------------------------+---------+
++
++
++the number of torrents that are currently loaded
++
++.. _ses.num_piece_passed:
++
++.. _ses.num_piece_failed:
++
++.. _ses.num_have_pieces:
++
++.. _ses.num_total_pieces_added:
++
++.. raw:: html
++
++	<a name="ses.num_piece_passed"></a>
++	<a name="ses.num_piece_failed"></a>
++	<a name="ses.num_have_pieces"></a>
++	<a name="ses.num_total_pieces_added"></a>
++
+++----------------------------+---------+
++| name                       | type    |
+++============================+=========+
++| ses.num_piece_passed       | counter |
+++----------------------------+---------+
++| ses.num_piece_failed       | counter |
+++----------------------------+---------+
++| ses.num_have_pieces        | counter |
+++----------------------------+---------+
++| ses.num_total_pieces_added | counter |
+++----------------------------+---------+
++
++
++these count the number of times a piece has passed the
++hash check, the number of times a piece was successfully
++written to disk and the number of total possible pieces
++added by adding torrents. e.g. when adding a torrent with
++1000 piece, num_total_pieces_added is incremented by 1000.
++
++.. _ses.torrent_evicted_counter:
++
++.. raw:: html
++
++	<a name="ses.torrent_evicted_counter"></a>
++
+++-----------------------------+---------+
++| name                        | type    |
+++=============================+=========+
++| ses.torrent_evicted_counter | counter |
+++-----------------------------+---------+
++
++
++this counts the number of times a torrent has been
++evicted (only applies when `dynamic loading of torrent files`_
++is enabled).
++
++.. _ses.num_unchoke_slots:
++
++.. raw:: html
++
++	<a name="ses.num_unchoke_slots"></a>
++
+++-----------------------+---------+
++| name                  | type    |
+++=======================+=========+
++| ses.num_unchoke_slots | counter |
+++-----------------------+---------+
++
++
++the number of allowed unchoked peers
++
++.. _ses.num_incoming_choke:
++
++.. _ses.num_incoming_unchoke:
++
++.. _ses.num_incoming_interested:
++
++.. _ses.num_incoming_not_interested:
++
++.. _ses.num_incoming_have:
++
++.. _ses.num_incoming_bitfield:
++
++.. _ses.num_incoming_request:
++
++.. _ses.num_incoming_piece:
++
++.. _ses.num_incoming_cancel:
++
++.. _ses.num_incoming_dht_port:
++
++.. _ses.num_incoming_suggest:
++
++.. _ses.num_incoming_have_all:
++
++.. _ses.num_incoming_have_none:
++
++.. _ses.num_incoming_reject:
++
++.. _ses.num_incoming_allowed_fast:
++
++.. _ses.num_incoming_ext_handshake:
++
++.. _ses.num_incoming_pex:
++
++.. _ses.num_incoming_metadata:
++
++.. _ses.num_incoming_extended:
++
++.. _ses.num_outgoing_choke:
++
++.. _ses.num_outgoing_unchoke:
++
++.. _ses.num_outgoing_interested:
++
++.. _ses.num_outgoing_not_interested:
++
++.. _ses.num_outgoing_have:
++
++.. _ses.num_outgoing_bitfield:
++
++.. _ses.num_outgoing_request:
++
++.. _ses.num_outgoing_piece:
++
++.. _ses.num_outgoing_cancel:
++
++.. _ses.num_outgoing_dht_port:
++
++.. _ses.num_outgoing_suggest:
++
++.. _ses.num_outgoing_have_all:
++
++.. _ses.num_outgoing_have_none:
++
++.. _ses.num_outgoing_reject:
++
++.. _ses.num_outgoing_allowed_fast:
++
++.. _ses.num_outgoing_ext_handshake:
++
++.. _ses.num_outgoing_pex:
++
++.. _ses.num_outgoing_metadata:
++
++.. _ses.num_outgoing_extended:
++
++.. raw:: html
++
++	<a name="ses.num_incoming_choke"></a>
++	<a name="ses.num_incoming_unchoke"></a>
++	<a name="ses.num_incoming_interested"></a>
++	<a name="ses.num_incoming_not_interested"></a>
++	<a name="ses.num_incoming_have"></a>
++	<a name="ses.num_incoming_bitfield"></a>
++	<a name="ses.num_incoming_request"></a>
++	<a name="ses.num_incoming_piece"></a>
++	<a name="ses.num_incoming_cancel"></a>
++	<a name="ses.num_incoming_dht_port"></a>
++	<a name="ses.num_incoming_suggest"></a>
++	<a name="ses.num_incoming_have_all"></a>
++	<a name="ses.num_incoming_have_none"></a>
++	<a name="ses.num_incoming_reject"></a>
++	<a name="ses.num_incoming_allowed_fast"></a>
++	<a name="ses.num_incoming_ext_handshake"></a>
++	<a name="ses.num_incoming_pex"></a>
++	<a name="ses.num_incoming_metadata"></a>
++	<a name="ses.num_incoming_extended"></a>
++	<a name="ses.num_outgoing_choke"></a>
++	<a name="ses.num_outgoing_unchoke"></a>
++	<a name="ses.num_outgoing_interested"></a>
++	<a name="ses.num_outgoing_not_interested"></a>
++	<a name="ses.num_outgoing_have"></a>
++	<a name="ses.num_outgoing_bitfield"></a>
++	<a name="ses.num_outgoing_request"></a>
++	<a name="ses.num_outgoing_piece"></a>
++	<a name="ses.num_outgoing_cancel"></a>
++	<a name="ses.num_outgoing_dht_port"></a>
++	<a name="ses.num_outgoing_suggest"></a>
++	<a name="ses.num_outgoing_have_all"></a>
++	<a name="ses.num_outgoing_have_none"></a>
++	<a name="ses.num_outgoing_reject"></a>
++	<a name="ses.num_outgoing_allowed_fast"></a>
++	<a name="ses.num_outgoing_ext_handshake"></a>
++	<a name="ses.num_outgoing_pex"></a>
++	<a name="ses.num_outgoing_metadata"></a>
++	<a name="ses.num_outgoing_extended"></a>
++
+++---------------------------------+---------+
++| name                            | type    |
+++=================================+=========+
++| ses.num_incoming_choke          | counter |
+++---------------------------------+---------+
++| ses.num_incoming_unchoke        | counter |
+++---------------------------------+---------+
++| ses.num_incoming_interested     | counter |
+++---------------------------------+---------+
++| ses.num_incoming_not_interested | counter |
+++---------------------------------+---------+
++| ses.num_incoming_have           | counter |
+++---------------------------------+---------+
++| ses.num_incoming_bitfield       | counter |
+++---------------------------------+---------+
++| ses.num_incoming_request        | counter |
+++---------------------------------+---------+
++| ses.num_incoming_piece          | counter |
+++---------------------------------+---------+
++| ses.num_incoming_cancel         | counter |
+++---------------------------------+---------+
++| ses.num_incoming_dht_port       | counter |
+++---------------------------------+---------+
++| ses.num_incoming_suggest        | counter |
+++---------------------------------+---------+
++| ses.num_incoming_have_all       | counter |
+++---------------------------------+---------+
++| ses.num_incoming_have_none      | counter |
+++---------------------------------+---------+
++| ses.num_incoming_reject         | counter |
+++---------------------------------+---------+
++| ses.num_incoming_allowed_fast   | counter |
+++---------------------------------+---------+
++| ses.num_incoming_ext_handshake  | counter |
+++---------------------------------+---------+
++| ses.num_incoming_pex            | counter |
+++---------------------------------+---------+
++| ses.num_incoming_metadata       | counter |
+++---------------------------------+---------+
++| ses.num_incoming_extended       | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_choke          | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_unchoke        | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_interested     | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_not_interested | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_have           | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_bitfield       | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_request        | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_piece          | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_cancel         | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_dht_port       | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_suggest        | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_have_all       | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_have_none      | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_reject         | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_allowed_fast   | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_ext_handshake  | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_pex            | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_metadata       | counter |
+++---------------------------------+---------+
++| ses.num_outgoing_extended       | counter |
+++---------------------------------+---------+
++
++
++bittorrent message counters. These counters are incremented
++every time a message of the corresponding type is received from
++or sent to a bittorrent peer.
++
++.. _ses.waste_piece_timed_out:
++
++.. _ses.waste_piece_cancelled:
++
++.. _ses.waste_piece_unknown:
++
++.. _ses.waste_piece_seed:
++
++.. _ses.waste_piece_end_game:
++
++.. _ses.waste_piece_closing:
++
++.. raw:: html
++
++	<a name="ses.waste_piece_timed_out"></a>
++	<a name="ses.waste_piece_cancelled"></a>
++	<a name="ses.waste_piece_unknown"></a>
++	<a name="ses.waste_piece_seed"></a>
++	<a name="ses.waste_piece_end_game"></a>
++	<a name="ses.waste_piece_closing"></a>
++
+++---------------------------+---------+
++| name                      | type    |
+++===========================+=========+
++| ses.waste_piece_timed_out | counter |
+++---------------------------+---------+
++| ses.waste_piece_cancelled | counter |
+++---------------------------+---------+
++| ses.waste_piece_unknown   | counter |
+++---------------------------+---------+
++| ses.waste_piece_seed      | counter |
+++---------------------------+---------+
++| ses.waste_piece_end_game  | counter |
+++---------------------------+---------+
++| ses.waste_piece_closing   | counter |
+++---------------------------+---------+
++
++
++the number of wasted downloaded bytes by reason of the bytes being
++wasted.
++
++.. _picker.piece_picker_partial_loops:
++
++.. _picker.piece_picker_suggest_loops:
++
++.. _picker.piece_picker_sequential_loops:
++
++.. _picker.piece_picker_reverse_rare_loops:
++
++.. _picker.piece_picker_rare_loops:
++
++.. _picker.piece_picker_rand_start_loops:
++
++.. _picker.piece_picker_rand_loops:
++
++.. _picker.piece_picker_busy_loops:
++
++.. raw:: html
++
++	<a name="picker.piece_picker_partial_loops"></a>
++	<a name="picker.piece_picker_suggest_loops"></a>
++	<a name="picker.piece_picker_sequential_loops"></a>
++	<a name="picker.piece_picker_reverse_rare_loops"></a>
++	<a name="picker.piece_picker_rare_loops"></a>
++	<a name="picker.piece_picker_rand_start_loops"></a>
++	<a name="picker.piece_picker_rand_loops"></a>
++	<a name="picker.piece_picker_busy_loops"></a>
++
+++----------------------------------------+---------+
++| name                                   | type    |
+++========================================+=========+
++| picker.piece_picker_partial_loops      | counter |
+++----------------------------------------+---------+
++| picker.piece_picker_suggest_loops      | counter |
+++----------------------------------------+---------+
++| picker.piece_picker_sequential_loops   | counter |
+++----------------------------------------+---------+
++| picker.piece_picker_reverse_rare_loops | counter |
+++----------------------------------------+---------+
++| picker.piece_picker_rare_loops         | counter |
+++----------------------------------------+---------+
++| picker.piece_picker_rand_start_loops   | counter |
+++----------------------------------------+---------+
++| picker.piece_picker_rand_loops         | counter |
+++----------------------------------------+---------+
++| picker.piece_picker_busy_loops         | counter |
+++----------------------------------------+---------+
++
++
++the number of pieces considered while picking pieces
++
++.. _picker.reject_piece_picks:
++
++.. _picker.unchoke_piece_picks:
++
++.. _picker.incoming_redundant_piece_picks:
++
++.. _picker.incoming_piece_picks:
++
++.. _picker.end_game_piece_picks:
++
++.. _picker.snubbed_piece_picks:
++
++.. _picker.interesting_piece_picks:
++
++.. _picker.hash_fail_piece_picks:
++
++.. _disk.write_cache_blocks:
++
++.. _disk.read_cache_blocks:
++
++.. raw:: html
++
++	<a name="picker.reject_piece_picks"></a>
++	<a name="picker.unchoke_piece_picks"></a>
++	<a name="picker.incoming_redundant_piece_picks"></a>
++	<a name="picker.incoming_piece_picks"></a>
++	<a name="picker.end_game_piece_picks"></a>
++	<a name="picker.snubbed_piece_picks"></a>
++	<a name="picker.interesting_piece_picks"></a>
++	<a name="picker.hash_fail_piece_picks"></a>
++	<a name="disk.write_cache_blocks"></a>
++	<a name="disk.read_cache_blocks"></a>
++
+++---------------------------------------+---------+
++| name                                  | type    |
+++=======================================+=========+
++| picker.reject_piece_picks             | counter |
+++---------------------------------------+---------+
++| picker.unchoke_piece_picks            | counter |
+++---------------------------------------+---------+
++| picker.incoming_redundant_piece_picks | counter |
+++---------------------------------------+---------+
++| picker.incoming_piece_picks           | counter |
+++---------------------------------------+---------+
++| picker.end_game_piece_picks           | counter |
+++---------------------------------------+---------+
++| picker.snubbed_piece_picks            | counter |
+++---------------------------------------+---------+
++| picker.interesting_piece_picks        | counter |
+++---------------------------------------+---------+
++| picker.hash_fail_piece_picks          | counter |
+++---------------------------------------+---------+
++| disk.write_cache_blocks               | counter |
+++---------------------------------------+---------+
++| disk.read_cache_blocks                | counter |
+++---------------------------------------+---------+
++
++
++This breaks down the piece picks into the event that
++triggered it
++
++.. _disk.request_latency:
++
++.. _disk.pinned_blocks:
++
++.. _disk.disk_blocks_in_use:
++
++.. _disk.queued_disk_jobs:
++
++.. _disk.num_running_disk_jobs:
++
++.. _disk.num_read_jobs:
++
++.. _disk.num_write_jobs:
++
++.. _disk.num_jobs:
++
++.. _disk.num_writing_threads:
++
++.. _disk.num_running_threads:
++
++.. _disk.blocked_disk_jobs:
++
++.. raw:: html
++
++	<a name="disk.request_latency"></a>
++	<a name="disk.pinned_blocks"></a>
++	<a name="disk.disk_blocks_in_use"></a>
++	<a name="disk.queued_disk_jobs"></a>
++	<a name="disk.num_running_disk_jobs"></a>
++	<a name="disk.num_read_jobs"></a>
++	<a name="disk.num_write_jobs"></a>
++	<a name="disk.num_jobs"></a>
++	<a name="disk.num_writing_threads"></a>
++	<a name="disk.num_running_threads"></a>
++	<a name="disk.blocked_disk_jobs"></a>
++
+++----------------------------+---------+
++| name                       | type    |
+++============================+=========+
++| disk.request_latency       | counter |
+++----------------------------+---------+
++| disk.pinned_blocks         | counter |
+++----------------------------+---------+
++| disk.disk_blocks_in_use    | counter |
+++----------------------------+---------+
++| disk.queued_disk_jobs      | counter |
+++----------------------------+---------+
++| disk.num_running_disk_jobs | counter |
+++----------------------------+---------+
++| disk.num_read_jobs         | counter |
+++----------------------------+---------+
++| disk.num_write_jobs        | counter |
+++----------------------------+---------+
++| disk.num_jobs              | counter |
+++----------------------------+---------+
++| disk.num_writing_threads   | counter |
+++----------------------------+---------+
++| disk.num_running_threads   | counter |
+++----------------------------+---------+
++| disk.blocked_disk_jobs     | counter |
+++----------------------------+---------+
++
++
++the number of microseconds it takes from receiving a request from a
++peer until we're sending the response back on the socket.
++
++.. _disk.queued_write_bytes:
++
++.. _disk.arc_mru_size:
++
++.. _disk.arc_mru_ghost_size:
++
++.. _disk.arc_mfu_size:
++
++.. _disk.arc_mfu_ghost_size:
++
++.. _disk.arc_write_size:
++
++.. _disk.arc_volatile_size:
++
++.. raw:: html
++
++	<a name="disk.queued_write_bytes"></a>
++	<a name="disk.arc_mru_size"></a>
++	<a name="disk.arc_mru_ghost_size"></a>
++	<a name="disk.arc_mfu_size"></a>
++	<a name="disk.arc_mfu_ghost_size"></a>
++	<a name="disk.arc_write_size"></a>
++	<a name="disk.arc_volatile_size"></a>
++
+++-------------------------+---------+
++| name                    | type    |
+++=========================+=========+
++| disk.queued_write_bytes | counter |
+++-------------------------+---------+
++| disk.arc_mru_size       | counter |
+++-------------------------+---------+
++| disk.arc_mru_ghost_size | counter |
+++-------------------------+---------+
++| disk.arc_mfu_size       | counter |
+++-------------------------+---------+
++| disk.arc_mfu_ghost_size | counter |
+++-------------------------+---------+
++| disk.arc_write_size     | counter |
+++-------------------------+---------+
++| disk.arc_volatile_size  | counter |
+++-------------------------+---------+
++
++
++the number of bytes we have sent to the disk I/O
++thread for writing. Every time we hear back from
++the disk I/O thread with a completed write job, this
++is updated to the number of bytes the disk I/O thread
++is actually waiting for to be written (as opposed to
++bytes just hanging out in the cache)
++
++.. _disk.num_blocks_written:
++
++.. _disk.num_blocks_read:
++
++.. raw:: html
++
++	<a name="disk.num_blocks_written"></a>
++	<a name="disk.num_blocks_read"></a>
++
+++-------------------------+---------+
++| name                    | type    |
+++=========================+=========+
++| disk.num_blocks_written | counter |
+++-------------------------+---------+
++| disk.num_blocks_read    | counter |
+++-------------------------+---------+
++
++
++the number of blocks written and read from disk in total. A block is
++16 kiB.
++
++.. _disk.num_blocks_hashed:
++
++.. raw:: html
++
++	<a name="disk.num_blocks_hashed"></a>
++
+++------------------------+---------+
++| name                   | type    |
+++========================+=========+
++| disk.num_blocks_hashed | counter |
+++------------------------+---------+
++
++
++the total number of blocks run through SHA-1 hashing
++
++.. _disk.num_blocks_cache_hits:
++
++.. raw:: html
++
++	<a name="disk.num_blocks_cache_hits"></a>
++
+++----------------------------+---------+
++| name                       | type    |
+++============================+=========+
++| disk.num_blocks_cache_hits | counter |
+++----------------------------+---------+
++
++
++the number of blocks read from the disk cache
++
++.. _disk.num_write_ops:
++
++.. _disk.num_read_ops:
++
++.. raw:: html
++
++	<a name="disk.num_write_ops"></a>
++	<a name="disk.num_read_ops"></a>
++
+++--------------------+---------+
++| name               | type    |
+++====================+=========+
++| disk.num_write_ops | counter |
+++--------------------+---------+
++| disk.num_read_ops  | counter |
+++--------------------+---------+
++
++
++the number of disk I/O operation for reads and writes. One disk
++operation may transfer more then one block.
++
++.. _disk.num_read_back:
++
++.. raw:: html
++
++	<a name="disk.num_read_back"></a>
++
+++--------------------+---------+
++| name               | type    |
+++====================+=========+
++| disk.num_read_back | counter |
+++--------------------+---------+
++
++
++the number of blocks that had to be read back from disk in order to
++hash a piece (when verifying against the piece hash)
++
++.. _disk.disk_read_time:
++
++.. _disk.disk_write_time:
++
++.. _disk.disk_hash_time:
++
++.. _disk.disk_job_time:
++
++.. raw:: html
++
++	<a name="disk.disk_read_time"></a>
++	<a name="disk.disk_write_time"></a>
++	<a name="disk.disk_hash_time"></a>
++	<a name="disk.disk_job_time"></a>
++
+++----------------------+---------+
++| name                 | type    |
+++======================+=========+
++| disk.disk_read_time  | counter |
+++----------------------+---------+
++| disk.disk_write_time | counter |
+++----------------------+---------+
++| disk.disk_hash_time  | counter |
+++----------------------+---------+
++| disk.disk_job_time   | counter |
+++----------------------+---------+
++
++
++cumulative time spent in various disk jobs, as well
++as total for all disk jobs. Measured in microseconds
++
++.. _disk.num_fenced_read:
++
++.. _disk.num_fenced_write:
++
++.. _disk.num_fenced_hash:
++
++.. _disk.num_fenced_move_storage:
++
++.. _disk.num_fenced_release_files:
++
++.. _disk.num_fenced_delete_files:
++
++.. _disk.num_fenced_check_fastresume:
++
++.. _disk.num_fenced_save_resume_data:
++
++.. _disk.num_fenced_rename_file:
++
++.. _disk.num_fenced_stop_torrent:
++
++.. _disk.num_fenced_cache_piece:
++
++.. _disk.num_fenced_flush_piece:
++
++.. _disk.num_fenced_flush_hashed:
++
++.. _disk.num_fenced_flush_storage:
++
++.. _disk.num_fenced_trim_cache:
++
++.. _disk.num_fenced_file_priority:
++
++.. _disk.num_fenced_load_torrent:
++
++.. _disk.num_fenced_clear_piece:
++
++.. _disk.num_fenced_tick_storage:
++
++.. raw:: html
++
++	<a name="disk.num_fenced_read"></a>
++	<a name="disk.num_fenced_write"></a>
++	<a name="disk.num_fenced_hash"></a>
++	<a name="disk.num_fenced_move_storage"></a>
++	<a name="disk.num_fenced_release_files"></a>
++	<a name="disk.num_fenced_delete_files"></a>
++	<a name="disk.num_fenced_check_fastresume"></a>
++	<a name="disk.num_fenced_save_resume_data"></a>
++	<a name="disk.num_fenced_rename_file"></a>
++	<a name="disk.num_fenced_stop_torrent"></a>
++	<a name="disk.num_fenced_cache_piece"></a>
++	<a name="disk.num_fenced_flush_piece"></a>
++	<a name="disk.num_fenced_flush_hashed"></a>
++	<a name="disk.num_fenced_flush_storage"></a>
++	<a name="disk.num_fenced_trim_cache"></a>
++	<a name="disk.num_fenced_file_priority"></a>
++	<a name="disk.num_fenced_load_torrent"></a>
++	<a name="disk.num_fenced_clear_piece"></a>
++	<a name="disk.num_fenced_tick_storage"></a>
++
+++----------------------------------+---------+
++| name                             | type    |
+++==================================+=========+
++| disk.num_fenced_read             | counter |
+++----------------------------------+---------+
++| disk.num_fenced_write            | counter |
+++----------------------------------+---------+
++| disk.num_fenced_hash             | counter |
+++----------------------------------+---------+
++| disk.num_fenced_move_storage     | counter |
+++----------------------------------+---------+
++| disk.num_fenced_release_files    | counter |
+++----------------------------------+---------+
++| disk.num_fenced_delete_files     | counter |
+++----------------------------------+---------+
++| disk.num_fenced_check_fastresume | counter |
+++----------------------------------+---------+
++| disk.num_fenced_save_resume_data | counter |
+++----------------------------------+---------+
++| disk.num_fenced_rename_file      | counter |
+++----------------------------------+---------+
++| disk.num_fenced_stop_torrent     | counter |
+++----------------------------------+---------+
++| disk.num_fenced_cache_piece      | counter |
+++----------------------------------+---------+
++| disk.num_fenced_flush_piece      | counter |
+++----------------------------------+---------+
++| disk.num_fenced_flush_hashed     | counter |
+++----------------------------------+---------+
++| disk.num_fenced_flush_storage    | counter |
+++----------------------------------+---------+
++| disk.num_fenced_trim_cache       | counter |
+++----------------------------------+---------+
++| disk.num_fenced_file_priority    | counter |
+++----------------------------------+---------+
++| disk.num_fenced_load_torrent     | counter |
+++----------------------------------+---------+
++| disk.num_fenced_clear_piece      | counter |
+++----------------------------------+---------+
++| disk.num_fenced_tick_storage     | counter |
+++----------------------------------+---------+
++
++
++for each kind of disk job, a counter of how many jobs of that kind
++are currently blocked by a disk fence
++
++.. _dht.dht_nodes:
++
++.. raw:: html
++
++	<a name="dht.dht_nodes"></a>
++
+++---------------+---------+
++| name          | type    |
+++===============+=========+
++| dht.dht_nodes | counter |
+++---------------+---------+
++
++
++The number of nodes in the DHT routing table
++
++.. _dht.dht_node_cache:
++
++.. raw:: html
++
++	<a name="dht.dht_node_cache"></a>
++
+++--------------------+---------+
++| name               | type    |
+++====================+=========+
++| dht.dht_node_cache | counter |
+++--------------------+---------+
++
++
++The number of replacement nodes in the DHT routing table
++
++.. _dht.dht_torrents:
++
++.. raw:: html
++
++	<a name="dht.dht_torrents"></a>
++
+++------------------+---------+
++| name             | type    |
+++==================+=========+
++| dht.dht_torrents | counter |
+++------------------+---------+
++
++
++the number of torrents currently tracked by our DHT node
++
++.. _dht.dht_peers:
++
++.. raw:: html
++
++	<a name="dht.dht_peers"></a>
++
+++---------------+---------+
++| name          | type    |
+++===============+=========+
++| dht.dht_peers | counter |
+++---------------+---------+
++
++
++the number of peers currently tracked by our DHT node
++
++.. _dht.dht_immutable_data:
++
++.. raw:: html
++
++	<a name="dht.dht_immutable_data"></a>
++
+++------------------------+---------+
++| name                   | type    |
+++========================+=========+
++| dht.dht_immutable_data | counter |
+++------------------------+---------+
++
++
++the number of immutable data items tracked by our DHT node
++
++.. _dht.dht_mutable_data:
++
++.. raw:: html
++
++	<a name="dht.dht_mutable_data"></a>
++
+++----------------------+---------+
++| name                 | type    |
+++======================+=========+
++| dht.dht_mutable_data | counter |
+++----------------------+---------+
++
++
++the number of mutable data items tracked by our DHT node
++
++.. _dht.dht_allocated_observers:
++
++.. raw:: html
++
++	<a name="dht.dht_allocated_observers"></a>
++
+++-----------------------------+---------+
++| name                        | type    |
+++=============================+=========+
++| dht.dht_allocated_observers | counter |
+++-----------------------------+---------+
++
++
++the number of RPC observers currently allocated
++
++.. _dht.dht_messages_in:
++
++.. _dht.dht_messages_out:
++
++.. raw:: html
++
++	<a name="dht.dht_messages_in"></a>
++	<a name="dht.dht_messages_out"></a>
++
+++----------------------+---------+
++| name                 | type    |
+++======================+=========+
++| dht.dht_messages_in  | counter |
+++----------------------+---------+
++| dht.dht_messages_out | counter |
+++----------------------+---------+
++
++
++the total number of DHT messages sent and received
++
++.. _dht.dht_messages_out_dropped:
++
++.. raw:: html
++
++	<a name="dht.dht_messages_out_dropped"></a>
++
+++------------------------------+---------+
++| name                         | type    |
+++==============================+=========+
++| dht.dht_messages_out_dropped | counter |
+++------------------------------+---------+
++
++
++the number of outgoing messages that failed to be
++sent
++
++.. _dht.dht_bytes_in:
++
++.. _dht.dht_bytes_out:
++
++.. raw:: html
++
++	<a name="dht.dht_bytes_in"></a>
++	<a name="dht.dht_bytes_out"></a>
++
+++-------------------+---------+
++| name              | type    |
+++===================+=========+
++| dht.dht_bytes_in  | counter |
+++-------------------+---------+
++| dht.dht_bytes_out | counter |
+++-------------------+---------+
++
++
++the total number of bytes sent and received by the DHT
++
++.. _dht.dht_ping_in:
++
++.. _dht.dht_ping_out:
++
++.. _dht.dht_find_node_in:
++
++.. _dht.dht_find_node_out:
++
++.. _dht.dht_get_peers_in:
++
++.. _dht.dht_get_peers_out:
++
++.. _dht.dht_announce_peer_in:
++
++.. _dht.dht_announce_peer_out:
++
++.. _dht.dht_get_in:
++
++.. _dht.dht_get_out:
++
++.. _dht.dht_put_in:
++
++.. _dht.dht_put_out:
++
++.. raw:: html
++
++	<a name="dht.dht_ping_in"></a>
++	<a name="dht.dht_ping_out"></a>
++	<a name="dht.dht_find_node_in"></a>
++	<a name="dht.dht_find_node_out"></a>
++	<a name="dht.dht_get_peers_in"></a>
++	<a name="dht.dht_get_peers_out"></a>
++	<a name="dht.dht_announce_peer_in"></a>
++	<a name="dht.dht_announce_peer_out"></a>
++	<a name="dht.dht_get_in"></a>
++	<a name="dht.dht_get_out"></a>
++	<a name="dht.dht_put_in"></a>
++	<a name="dht.dht_put_out"></a>
++
+++---------------------------+---------+
++| name                      | type    |
+++===========================+=========+
++| dht.dht_ping_in           | counter |
+++---------------------------+---------+
++| dht.dht_ping_out          | counter |
+++---------------------------+---------+
++| dht.dht_find_node_in      | counter |
+++---------------------------+---------+
++| dht.dht_find_node_out     | counter |
+++---------------------------+---------+
++| dht.dht_get_peers_in      | counter |
+++---------------------------+---------+
++| dht.dht_get_peers_out     | counter |
+++---------------------------+---------+
++| dht.dht_announce_peer_in  | counter |
+++---------------------------+---------+
++| dht.dht_announce_peer_out | counter |
+++---------------------------+---------+
++| dht.dht_get_in            | counter |
+++---------------------------+---------+
++| dht.dht_get_out           | counter |
+++---------------------------+---------+
++| dht.dht_put_in            | counter |
+++---------------------------+---------+
++| dht.dht_put_out           | counter |
+++---------------------------+---------+
++
++
++the number of DHT messages we've sent and received
++by kind.
++
++.. _dht.dht_invalid_announce:
++
++.. _dht.dht_invalid_get_peers:
++
++.. _dht.dht_invalid_put:
++
++.. _dht.dht_invalid_get:
++
++.. raw:: html
++
++	<a name="dht.dht_invalid_announce"></a>
++	<a name="dht.dht_invalid_get_peers"></a>
++	<a name="dht.dht_invalid_put"></a>
++	<a name="dht.dht_invalid_get"></a>
++
+++---------------------------+---------+
++| name                      | type    |
+++===========================+=========+
++| dht.dht_invalid_announce  | counter |
+++---------------------------+---------+
++| dht.dht_invalid_get_peers | counter |
+++---------------------------+---------+
++| dht.dht_invalid_put       | counter |
+++---------------------------+---------+
++| dht.dht_invalid_get       | counter |
+++---------------------------+---------+
++
++
++the number of failed incoming DHT requests by kind of request
++
++.. _utp.utp_packet_loss:
++
++.. _utp.utp_timeout:
++
++.. _utp.utp_packets_in:
++
++.. _utp.utp_packets_out:
++
++.. _utp.utp_fast_retransmit:
++
++.. _utp.utp_packet_resend:
++
++.. _utp.utp_samples_above_target:
++
++.. _utp.utp_samples_below_target:
++
++.. _utp.utp_payload_pkts_in:
++
++.. _utp.utp_payload_pkts_out:
++
++.. _utp.utp_invalid_pkts_in:
++
++.. _utp.utp_redundant_pkts_in:
++
++.. raw:: html
++
++	<a name="utp.utp_packet_loss"></a>
++	<a name="utp.utp_timeout"></a>
++	<a name="utp.utp_packets_in"></a>
++	<a name="utp.utp_packets_out"></a>
++	<a name="utp.utp_fast_retransmit"></a>
++	<a name="utp.utp_packet_resend"></a>
++	<a name="utp.utp_samples_above_target"></a>
++	<a name="utp.utp_samples_below_target"></a>
++	<a name="utp.utp_payload_pkts_in"></a>
++	<a name="utp.utp_payload_pkts_out"></a>
++	<a name="utp.utp_invalid_pkts_in"></a>
++	<a name="utp.utp_redundant_pkts_in"></a>
++
+++------------------------------+---------+
++| name                         | type    |
+++==============================+=========+
++| utp.utp_packet_loss          | counter |
+++------------------------------+---------+
++| utp.utp_timeout              | counter |
+++------------------------------+---------+
++| utp.utp_packets_in           | counter |
+++------------------------------+---------+
++| utp.utp_packets_out          | counter |
+++------------------------------+---------+
++| utp.utp_fast_retransmit      | counter |
+++------------------------------+---------+
++| utp.utp_packet_resend        | counter |
+++------------------------------+---------+
++| utp.utp_samples_above_target | counter |
+++------------------------------+---------+
++| utp.utp_samples_below_target | counter |
+++------------------------------+---------+
++| utp.utp_payload_pkts_in      | counter |
+++------------------------------+---------+
++| utp.utp_payload_pkts_out     | counter |
+++------------------------------+---------+
++| utp.utp_invalid_pkts_in      | counter |
+++------------------------------+---------+
++| utp.utp_redundant_pkts_in    | counter |
+++------------------------------+---------+
++
++
++uTP counters. Each counter represents the number of time each event
++has occurred.
++
++.. _utp.num_utp_idle:
++
++.. _utp.num_utp_syn_sent:
++
++.. _utp.num_utp_connected:
++
++.. _utp.num_utp_fin_sent:
++
++.. _utp.num_utp_close_wait:
++
++.. raw:: html
++
++	<a name="utp.num_utp_idle"></a>
++	<a name="utp.num_utp_syn_sent"></a>
++	<a name="utp.num_utp_connected"></a>
++	<a name="utp.num_utp_fin_sent"></a>
++	<a name="utp.num_utp_close_wait"></a>
++
+++------------------------+---------+
++| name                   | type    |
+++========================+=========+
++| utp.num_utp_idle       | counter |
+++------------------------+---------+
++| utp.num_utp_syn_sent   | counter |
+++------------------------+---------+
++| utp.num_utp_connected  | counter |
+++------------------------+---------+
++| utp.num_utp_fin_sent   | counter |
+++------------------------+---------+
++| utp.num_utp_close_wait | counter |
+++------------------------+---------+
++
++
++the number of uTP sockets in each respective state
++
++.. _sock_bufs.socket_send_size3:
++
++.. _sock_bufs.socket_send_size4:
++
++.. _sock_bufs.socket_send_size5:
++
++.. _sock_bufs.socket_send_size6:
++
++.. _sock_bufs.socket_send_size7:
++
++.. _sock_bufs.socket_send_size8:
++
++.. _sock_bufs.socket_send_size9:
++
++.. _sock_bufs.socket_send_size10:
++
++.. _sock_bufs.socket_send_size11:
++
++.. _sock_bufs.socket_send_size12:
++
++.. _sock_bufs.socket_send_size13:
++
++.. _sock_bufs.socket_send_size14:
++
++.. _sock_bufs.socket_send_size15:
++
++.. _sock_bufs.socket_send_size16:
++
++.. _sock_bufs.socket_send_size17:
++
++.. _sock_bufs.socket_send_size18:
++
++.. _sock_bufs.socket_send_size19:
++
++.. _sock_bufs.socket_send_size20:
++
++.. _sock_bufs.socket_recv_size3:
++
++.. _sock_bufs.socket_recv_size4:
++
++.. _sock_bufs.socket_recv_size5:
++
++.. _sock_bufs.socket_recv_size6:
++
++.. _sock_bufs.socket_recv_size7:
++
++.. _sock_bufs.socket_recv_size8:
++
++.. _sock_bufs.socket_recv_size9:
++
++.. _sock_bufs.socket_recv_size10:
++
++.. _sock_bufs.socket_recv_size11:
++
++.. _sock_bufs.socket_recv_size12:
++
++.. _sock_bufs.socket_recv_size13:
++
++.. _sock_bufs.socket_recv_size14:
++
++.. _sock_bufs.socket_recv_size15:
++
++.. _sock_bufs.socket_recv_size16:
++
++.. _sock_bufs.socket_recv_size17:
++
++.. _sock_bufs.socket_recv_size18:
++
++.. _sock_bufs.socket_recv_size19:
++
++.. _sock_bufs.socket_recv_size20:
++
++.. raw:: html
++
++	<a name="sock_bufs.socket_send_size3"></a>
++	<a name="sock_bufs.socket_send_size4"></a>
++	<a name="sock_bufs.socket_send_size5"></a>
++	<a name="sock_bufs.socket_send_size6"></a>
++	<a name="sock_bufs.socket_send_size7"></a>
++	<a name="sock_bufs.socket_send_size8"></a>
++	<a name="sock_bufs.socket_send_size9"></a>
++	<a name="sock_bufs.socket_send_size10"></a>
++	<a name="sock_bufs.socket_send_size11"></a>
++	<a name="sock_bufs.socket_send_size12"></a>
++	<a name="sock_bufs.socket_send_size13"></a>
++	<a name="sock_bufs.socket_send_size14"></a>
++	<a name="sock_bufs.socket_send_size15"></a>
++	<a name="sock_bufs.socket_send_size16"></a>
++	<a name="sock_bufs.socket_send_size17"></a>
++	<a name="sock_bufs.socket_send_size18"></a>
++	<a name="sock_bufs.socket_send_size19"></a>
++	<a name="sock_bufs.socket_send_size20"></a>
++	<a name="sock_bufs.socket_recv_size3"></a>
++	<a name="sock_bufs.socket_recv_size4"></a>
++	<a name="sock_bufs.socket_recv_size5"></a>
++	<a name="sock_bufs.socket_recv_size6"></a>
++	<a name="sock_bufs.socket_recv_size7"></a>
++	<a name="sock_bufs.socket_recv_size8"></a>
++	<a name="sock_bufs.socket_recv_size9"></a>
++	<a name="sock_bufs.socket_recv_size10"></a>
++	<a name="sock_bufs.socket_recv_size11"></a>
++	<a name="sock_bufs.socket_recv_size12"></a>
++	<a name="sock_bufs.socket_recv_size13"></a>
++	<a name="sock_bufs.socket_recv_size14"></a>
++	<a name="sock_bufs.socket_recv_size15"></a>
++	<a name="sock_bufs.socket_recv_size16"></a>
++	<a name="sock_bufs.socket_recv_size17"></a>
++	<a name="sock_bufs.socket_recv_size18"></a>
++	<a name="sock_bufs.socket_recv_size19"></a>
++	<a name="sock_bufs.socket_recv_size20"></a>
++
+++------------------------------+---------+
++| name                         | type    |
+++==============================+=========+
++| sock_bufs.socket_send_size3  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size4  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size5  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size6  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size7  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size8  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size9  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size10 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size11 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size12 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size13 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size14 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size15 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size16 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size17 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size18 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size19 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_send_size20 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size3  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size4  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size5  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size6  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size7  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size8  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size9  | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size10 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size11 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size12 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size13 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size14 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size15 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size16 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size17 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size18 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size19 | counter |
+++------------------------------+---------+
++| sock_bufs.socket_recv_size20 | counter |
+++------------------------------+---------+
++
++
++the buffer sizes accepted by
++socket send and receive calls respectively.
++The larger the buffers are, the more efficient,
++because it reqire fewer system calls per byte.
++The size is 1 << n, where n is the number
++at the end of the counter name. i.e.
++8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192,
++16384, 32768, 65536, 131072, 262144, 524288, 1048576
++bytes
++
diff -Nru libtorrent-rasterbar-1.0.6/debian/patches/python-clean-without-bjam.patch libtorrent-rasterbar-1.0.7/debian/patches/python-clean-without-bjam.patch
--- libtorrent-rasterbar-1.0.6/debian/patches/python-clean-without-bjam.patch	2015-08-29 16:50:48.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/debian/patches/python-clean-without-bjam.patch	2015-11-27 16:22:12.000000000 +0000
@@ -6,8 +6,8 @@
 
 Index: libtorrent-rasterbar/bindings/python/setup.py
 ===================================================================
---- libtorrent-rasterbar.orig/bindings/python/setup.py	2015-08-01 18:10:21.001621173 -0400
-+++ libtorrent-rasterbar/bindings/python/setup.py	2015-08-01 18:10:20.997621106 -0400
+--- libtorrent-rasterbar.orig/bindings/python/setup.py	2015-11-27 11:21:15.696003799 -0500
++++ libtorrent-rasterbar/bindings/python/setup.py	2015-11-27 11:21:15.696003799 -0500
 @@ -51,7 +51,7 @@
  ext = None
  packages = None
@@ -42,4 +42,4 @@
 +			libraries = ['torrent-rasterbar'] + parse_cmd(extra_cmd, '-l'))]
  
  setup(name = 'python-libtorrent',
- 	version = '1.0.6',
+ 	version = '1.0.7',
diff -Nru libtorrent-rasterbar-1.0.6/debian/patches/series libtorrent-rasterbar-1.0.7/debian/patches/series
--- libtorrent-rasterbar-1.0.6/debian/patches/series	2015-08-29 16:50:48.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/debian/patches/series	2015-11-27 17:39:38.000000000 +0000
@@ -1,2 +1,3 @@
+missing_rst_file.patch
 python-clean-without-bjam.patch
 fix-html-docs.patch
diff -Nru libtorrent-rasterbar-1.0.6/docs/building.html libtorrent-rasterbar-1.0.7/docs/building.html
--- libtorrent-rasterbar-1.0.6/docs/building.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/building.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/building.rst libtorrent-rasterbar-1.0.7/docs/building.rst
--- libtorrent-rasterbar-1.0.6/docs/building.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/building.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/contributing.html libtorrent-rasterbar-1.0.7/docs/contributing.html
--- libtorrent-rasterbar-1.0.6/docs/contributing.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/contributing.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/contributing.rst libtorrent-rasterbar-1.0.7/docs/contributing.rst
--- libtorrent-rasterbar-1.0.6/docs/contributing.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/contributing.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/dht_rss.html libtorrent-rasterbar-1.0.7/docs/dht_rss.html
--- libtorrent-rasterbar-1.0.6/docs/dht_rss.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/dht_rss.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/dht_rss.rst libtorrent-rasterbar-1.0.7/docs/dht_rss.rst
--- libtorrent-rasterbar-1.0.6/docs/dht_rss.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/dht_rss.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 ======================================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/dht_sec.html libtorrent-rasterbar-1.0.7/docs/dht_sec.html
--- libtorrent-rasterbar-1.0.6/docs/dht_sec.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/dht_sec.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/dht_sec.rst libtorrent-rasterbar-1.0.7/docs/dht_sec.rst
--- libtorrent-rasterbar-1.0.6/docs/dht_sec.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/dht_sec.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 =================================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/dht_store.html libtorrent-rasterbar-1.0.7/docs/dht_store.html
--- libtorrent-rasterbar-1.0.6/docs/dht_store.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/dht_store.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/dht_store.rst libtorrent-rasterbar-1.0.7/docs/dht_store.rst
--- libtorrent-rasterbar-1.0.6/docs/dht_store.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/dht_store.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 ============================================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/examples.html libtorrent-rasterbar-1.0.7/docs/examples.html
--- libtorrent-rasterbar-1.0.6/docs/examples.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/examples.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/examples.rst libtorrent-rasterbar-1.0.7/docs/examples.rst
--- libtorrent-rasterbar-1.0.6/docs/examples.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/examples.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 ===================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/features.html libtorrent-rasterbar-1.0.7/docs/features.html
--- libtorrent-rasterbar-1.0.6/docs/features.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/features.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/features.rst libtorrent-rasterbar-1.0.7/docs/features.rst
--- libtorrent-rasterbar-1.0.6/docs/features.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/features.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/hacking.html libtorrent-rasterbar-1.0.7/docs/hacking.html
--- libtorrent-rasterbar-1.0.6/docs/hacking.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/hacking.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
Binary files /tmp/WBQ_OzDV3P/libtorrent-rasterbar-1.0.6/docs/hacking.png and /tmp/PY6ChjGgAt/libtorrent-rasterbar-1.0.7/docs/hacking.png differ
diff -Nru libtorrent-rasterbar-1.0.6/docs/index.html libtorrent-rasterbar-1.0.7/docs/index.html
--- libtorrent-rasterbar-1.0.6/docs/index.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/index.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,11 +42,11 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div id="librarySidebar"><ul class="simple">
-<li><a class="reference external" href="https://sourceforge.net/projects/libtorrent/files/libtorrent/">download</a></li>
+<li><a class="reference external" href="https://github.com/arvidn/libtorrent/releases">download</a></li>
 <li><a class="reference external" href="https://sourceforge.net/projects/libtorrent/files/py-libtorrent/">download python binding</a></li>
 <li><a class="reference external" href="features.html">features</a></li>
 <li><a class="reference external" href="contributing.html">contributing</a></li>
@@ -60,7 +60,7 @@
 <li><a class="reference external" href="http://lists.sourceforge.net/lists/listinfo/libtorrent-discuss">mailing list</a> (<a class="reference external" href="http://dir.gmane.org/gmane.network.bit-torrent.libtorrent">archive</a>)</li>
 <li><a class="reference external" href="projects.html">who's using libtorrent?</a></li>
 <li><a class="reference external" href="https://github.com/arvidn/libtorrent/issues">report bugs</a></li>
-<li><a class="reference external" href="http:/github.com/arvidn/libtorrent">github page</a></li>
+<li><a class="reference external" href="https://github.com/arvidn/libtorrent">github page</a></li>
 <li><a class="reference external" href="http://blog.libtorrent.org">blog</a></li>
 </ul>
 <hr class="docutils" />
@@ -125,12 +125,11 @@
 </div>
 <div class="section" id="acknowledgements">
 <h2>Acknowledgements</h2>
-<p>Written by Arvid Norberg. Copyright © 2003-2014</p>
+<p>Written by Arvid Norberg. Copyright © 2003-2015</p>
 <p>Contributions by Magnus Jonsson, Daniel Wallin and Cory Nelson</p>
 <p>Thanks to Reimond Retz for bugfixes, suggestions and testing</p>
 <p>Thanks to <a class="reference external" href="http://www.cs.umu.se">Umeå University</a> for providing development and test hardware.</p>
-<p>Project is hosted by sourceforge.</p>
-<p><a class="reference external" href="http://sourceforge.net"><img alt="sf_logo" src="http://sourceforge.net/sflogo.php?group_id=7994" /></a></p>
+<p>Project is hosted by <a class="reference external" href="https://www.github.com/arvidn/libtorrent">github</a>.</p>
 </div></div>
 </div>
 
diff -Nru libtorrent-rasterbar-1.0.6/docs/index.rst libtorrent-rasterbar-1.0.7/docs/index.rst
--- libtorrent-rasterbar-1.0.6/docs/index.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/index.rst	2015-11-14 05:22:43.000000000 +0000
@@ -1,5 +1,5 @@
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. raw:: html
 
@@ -57,7 +57,7 @@
 libtorrent
 ==========
 
-.. _download: https://sourceforge.net/projects/libtorrent/files/libtorrent/
+.. _download: https://github.com/arvidn/libtorrent/releases
 .. _`download python binding`: https://sourceforge.net/projects/libtorrent/files/py-libtorrent/
 .. _features: features.html
 .. _contributing: contributing.html
@@ -82,7 +82,7 @@
 .. _archive: http://dir.gmane.org/gmane.network.bit-torrent.libtorrent
 .. _`who's using libtorrent?`: projects.html
 .. _`report bugs`: https://github.com/arvidn/libtorrent/issues
-.. _`github page`: http:/github.com/arvidn/libtorrent
+.. _`github page`: https://github.com/arvidn/libtorrent
 .. _blog: http://blog.libtorrent.org
 
 .. _`ruby bindings`: http://libtorrent-ruby.rubyforge.org/
@@ -147,7 +147,7 @@
 Acknowledgements
 ================
 
-Written by Arvid Norberg. Copyright |copy| 2003-2014
+Written by Arvid Norberg. Copyright |copy| 2003-2015
 
 Contributions by Magnus Jonsson, Daniel Wallin and Cory Nelson
 
@@ -157,13 +157,10 @@
 
 __ http://www.cs.umu.se
 
-Project is hosted by sourceforge.
+Project is hosted by github__.
 
-|sf_logo|__
+__ https://www.github.com/arvidn/libtorrent
 
-__ http://sourceforge.net
-
-.. |sf_logo| image:: http://sourceforge.net/sflogo.php?group_id=7994
 .. |copy| unicode:: 0xA9 .. copyright sign
 
 .. raw:: html
diff -Nru libtorrent-rasterbar-1.0.6/docs/manual-ref.html libtorrent-rasterbar-1.0.7/docs/manual-ref.html
--- libtorrent-rasterbar-1.0.6/docs/manual-ref.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/manual-ref.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
@@ -224,6 +224,21 @@
 <tt class="docutils literal">active_downloads</tt> setting, any auto managed torrents will be queued until
 torrents are removed so that the number drops below the limit.</p>
 <p>The default values are 8 active downloads and 5 active seeds.</p>
+<p>In addition to the downloading and seeding limits, there are limits on <em>actions</em>
+torrents perform. The downloading and seeding limits control whether peers are
+allowed at all, and if peers are not allowed, torrents are stopped and don't do
+anything. If peers are allowed, torrents may:</p>
+<ol class="arabic simple">
+<li>announce to trackers</li>
+<li>announce to the DHT</li>
+<li>announce to local peer discovery (local service discovery)</li>
+</ol>
+<p>Each of those actions are associated with a cost and hence may need a seprarate
+limit. These limits are controlled by <tt class="docutils literal">active_tracker_limit</tt>,
+<tt class="docutils literal">active_dht_limit</tt> and <tt class="docutils literal">active_lsd_limit</tt> respectively.</p>
+<p>A client that is not concerned about the separate costs of these actions should
+set all 3 of these limits to the same value as <tt class="docutils literal">active_limit</tt> (i.e.
+the max limit of any active torrent).</p>
 <p>At a regular interval, torrents are checked if there needs to be any
 re-ordering of which torrents are active and which are queued. This interval
 can be controlled via <tt class="docutils literal">auto_manage_interval</tt> in <a class="reference external" href="reference-Settings.html#session_settings">session_settings</a>. It defaults
@@ -358,6 +373,11 @@
 <tr><td><tt class="docutils literal">seed_mode</tt></td>
 <td>integer. 1 if the torrent is in seed mode, 0 otherwise.</td>
 </tr>
+<tr><td><tt class="docutils literal">priority</tt></td>
+<td>integer. The priority of a torrent determines how much
+bandwidth its peers are assigned when distributing upload
+and download rate quotas.</td>
+</tr>
 <tr><td><tt class="docutils literal">file_priority</tt></td>
 <td>list of integers. One entry per file in the torrent. Each
 entry is the priority of the file with the same index.</td>
diff -Nru libtorrent-rasterbar-1.0.6/docs/manual-ref.rst libtorrent-rasterbar-1.0.7/docs/manual-ref.rst
--- libtorrent-rasterbar-1.0.6/docs/manual-ref.rst	2015-07-12 22:23:54.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/manual-ref.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 ============================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 1
@@ -20,8 +20,8 @@
 * construct a `session`__
 * load `session`__ state from settings file (see `load_state()`__)
 * start extensions (see `add_extension()`__).
-* start DHT, LSD, UPnP, NAT-PMP etc (see `start_dht()`__, `start_lsd()`__, `start_upnp()`__
-  and `start_natpmp()`__).
+* start DHT, LSD, UPnP, NAT-PMP etc (see start_dht(), start_lsd(), start_upnp()
+  and start_natpmp()).
 * parse .torrent-files and add them to the `session`__ (see `torrent_info`__,
   `async_add_torrent()`__ and `add_torrent()`__)
 * main loop (see `session`__)
@@ -29,7 +29,7 @@
 	* poll for alerts (see `wait_for_alert()`__, `pop_alerts()`__)
 	* handle updates to torrents, (see `state_update_alert`__).
 	* handle other alerts, (see `alert`__).
-	* query the `session`__ for information (see `session::status()`__).
+	* query the `session`__ for information (see session::status()).
 	* add and remove torrents from the `session`__ (`remove_torrent()`__)
 
 * save resume data for all torrent_handles (optional, see
@@ -74,13 +74,13 @@
 ==================
 
 There are a few typedefs in the ``libtorrent`` namespace which pulls
-in network types from the ``asio`` namespace. These are::
+in network types from the ``boost::asio`` namespace. These are::
 
-	typedef asio::ip::address address;
-	typedef asio::ip::address_v4 address_v4;
-	typedef asio::ip::address_v6 address_v6;
-	using asio::ip::tcp;
-	using asio::ip::udp;
+	typedef boost::asio::ip::address address;
+	typedef boost::asio::ip::address_v4 address_v4;
+	typedef boost::asio::ip::address_v6 address_v6;
+	using boost::asio::ip::tcp;
+	using boost::asio::ip::udp;
 
 These are declared in the ``<libtorrent/socket.hpp>`` header.
 
@@ -174,63 +174,175 @@
 queuing
 =======
 
-libtorrent supports *queuing*. Which means it makes sure that a limited number of
-torrents are being downloaded at any given time, and once a torrent is completely
-downloaded, the next in line is started.
-
-Torrents that are *auto managed* are subject to the queuing and the active
-torrents limits. To make a torrent auto managed, set ``auto_managed`` to true
-when adding the torrent (see `async_add_torrent()`__ and `add_torrent()`__).
-
-The limits of the number of downloading and seeding torrents are controlled via
-``active_downloads``, ``active_seeds`` and ``active_limit`` in
-`session_settings`__. These limits takes non auto managed torrents into account as
-well. If there are more non-auto managed torrents being downloaded than the
-``active_downloads`` setting, any auto managed torrents will be queued until
-torrents are removed so that the number drops below the limit.
-
-The default values are 8 active downloads and 5 active seeds.
+libtorrent supports *queuing*. Queuing is a mechanism to automatically pause and
+resume torrents based on certain criteria. The criteria depends on the overall
+state the torrent is in (checking, downloading or seeding).
+
+To opt-out of the queuing logic, make sure your torrents are added with the
+`add_torrent_params::flag_auto_managed`__ bit *cleared*. Or call
+``torrent_handle::auto_managed(false)`` on the torrent handle.
+
+The overall purpose of the queuing logic is to improve performance under arbitrary
+torrent downloading and seeding load. For example, if you want to download 100
+torrents on a limited home connection, you improve performance by downloading
+them one at a time (or maybe two at a time), over downloading them all in
+parallel. The benefits are:
+
+* the average completion time of a torrent is half of what it would be if all
+  downloaded in parallel.
+* The amount of upload capacity is more likely to reach the *reciprocation rate*
+  of your peers, and is likely to improve your *return on investment* (download
+  to upload ratio)
+* your disk I/O load is likely to be more local which may improve I/O
+  performance and decrease fragmentation.
+
+There are fundamentally 3 seaparate queues:
+
+* checking torrents
+* downloading torrents
+* seeding torrents
+
+Every torrent that is not seeding has a queue number associated with it, this is
+its place in line to be started. See `torrent_status::queue_position`__.
+
+On top of the limits of each queue, there is an over arching limit, set in
+`settings_pack::active_limit`__. The auto manager will never start more than this
+number of torrents (with one exception described below). Non-auto-managed
+torrents are exempt from this logic, and not counted.
 
 At a regular interval, torrents are checked if there needs to be any
 re-ordering of which torrents are active and which are queued. This interval
-can be controlled via ``auto_manage_interval`` in `session_settings`__. It defaults
-to every 30 seconds.
+can be controlled via `settings_pack::auto_manage_interval`__.
 
 For queuing to work, resume data needs to be saved and restored for all
-torrents. See `save_resume_data()`__.
+torrents. See `torrent_handle::save_resume_data()`__.
 
-downloading
------------
+queue position
+--------------
 
-Torrents that are currently being downloaded or incomplete (with bytes still to
-download) are queued. The torrents in the front of the queue are started to be
-actively downloaded and the rest are ordered with regards to their queue
-position. Any newly added torrent is placed at the end of the queue. Once a
-torrent is removed or turns into a seed, its queue position is -1 and all
+The torrents in the front of the queue are started and the rest are ordered by
+their queue position. Any newly added torrent is placed at the end of the queue.
+Once a torrent is removed or turns into a seed, its queue position is -1 and all
 torrents that used to be after it in the queue, decreases their position in
 order to fill the gap.
 
-The queue positions are always in a sequence without any gaps.
+The queue positions are always contiguous, in a sequence without any gaps.
 
 Lower queue position means closer to the front of the queue, and will be
 started sooner than torrents with higher queue positions.
 
 To query a torrent for its position in the queue, or change its position, see:
-`queue_position()`__, `queue_position_up()`__, `queue_position_down()`__,
-`queue_position_top()`__ and `queue_position_bottom()`__.
+`torrent_handle::queue_position()`__, `torrent_handle::queue_position_up()`__,
+`torrent_handle::queue_position_down()`__, `torrent_handle::queue_position_top()`__
+and `torrent_handle::queue_position_bottom()`__.
+
+checking queue
+--------------
+
+The checking queue affects torrents in the torrent_status::checking or
+`torrent_status::allocating`__ state that are auto-managed.
+
+The checking queue will make sure that (of the torrents in its queue) no more than
+settings_pack::active_checking_limit torrents are started at any given time.
+Once a torrent completes checking and moves into a diffferent state, the next in
+line will be started for checking.
+
+Any torrent added force-started or force-stopped (i.e. the auto managed flag is
+_not_ set), will not be subject to this limit and they will all check
+independently and in parallel.
 
-seeding
--------
+downloading queue
+-----------------
+
+Similarly to the checking queue, the downloading queue will make sure that no
+more than `settings_pack::active_downloads`__ torrents are in the downloading
+state at any given time.
+
+The `torrent_status::queue_position`__ is used again here to determine who is next
+in line to be started once a downloading torrent completes or is stopped/removed.
+
+seeding queue
+-------------
+
+The seeding queue does not use `torrent_status::queue_position`__ to determine which
+torrent to seed. Instead, it estimates the *demand* for the torrent to be
+seeded. A torrent with few other seeds and many downloaders is assumed to have a
+higher demand of more seeds than one with many seeds and few downloaders.
+
+It limits the number of started seeds to `settings_pack::active_seeds`__.
 
-Auto managed seeding torrents are rotated, so that all of them are allocated a
-fair amount of seeding. Torrents with fewer completed *seed cycles* are
-prioritized for seeding. A seed cycle is completed when a torrent meets either
-the share ratio limit (uploaded bytes / downloaded bytes), the share time ratio
-(time seeding / time downloaing) or seed time limit (time seeded).
+On top of this basic bias, *seed priority* can be controller by specifying a
+seed ratio (the upload to download ratio), a seed-time ratio (the download
+time to seeding time ratio) and a seed-time (the abosulte time to be seeding a
+torrent). Until all those targets are hit, the torrent will be prioritized for
+seeding.
 
-The relevant settings to control these limits are ``share_ratio_limit``,
-``seed_time_ratio_limit`` and ``seed_time_limit`` in `session_settings`__.
+Among torrents that have met their seed target, torrents where we don't know of
+any other seed take strict priority.
 
+In order to avoid flapping, torrents that were started less than 30 minutes ago
+also have priority to keep seeding.
+
+Finally, for torrents where none of the above apply, they are prioritized based
+on the download to seed ratio.
+
+The relevant settings to control these limits are
+`settings_pack::share_ratio_limit`__, `settings_pack::seed_time_ratio_limit`__ and
+`settings_pack::seed_time_limit`__.
+
+queuing options
+---------------
+
+In addition to simply starting and stopping torrents, the queuing mechanism can
+have more fine grained control of the resources used by torrents.
+
+half-started torrents
+.....................
+
+In addition to the downloading and seeding limits, there are limits on *actions*
+torrents perform. The downloading and seeding limits control whether peers are
+allowed at all, and if peers are not allowed, torrents are stopped and don't do
+anything. If peers are allowed, torrents may:
+
+1. announce to trackers
+2. announce to the DHT
+3. announce to local peer discovery (local service discovery)
+
+Each of those actions are associated with a cost and hence may need a seprarate
+limit. These limits are controlled by `settings_pack::active_tracker_limit`__,
+`settings_pack::active_dht_limit`__ and `settings_pack::active_lsd_limit`__
+respectively.
+
+Specifically, announcing to a tracker is typically cheaper than
+announcing to the DHT. ``active_dht_limit`` will limit the number of
+torrents that are allowed to announce to the DHT. The highest priority ones
+will, and the lower priority ones won't. The will still be considered started
+though, and any incoming peers will still be accepted.
+
+If you do not wish to impose such limits (basically, if you do not wish to have
+half-started torrents) make sure to set these limits to -1 (infinite).
+
+prefer seeds
+............
+
+In the case where ``active_downloads`` + ``active_seeds`` > ``active_limit``,
+there's an ambiguity whether the downloads should be satisfied first or the
+seeds. To disambiguate this case, the `settings_pack::auto_manage_prefer_seeds`__
+determines whether seeds are preferred or not.
+
+inactive torrents
+.................
+
+Torrents that are not transferring any bytes (downloading or uploading) have a
+relatively low cost to be started. It's possible to exempt such torrents from
+the download and seed queues by setting `settings_pack::dont_count_slow_torrents`__
+to true.
+
+Since it sometimes may take a few minutes for a newly started torrent to find
+peers and be unchoked, or find peers that are interested in requesting data,
+torrents are not considered inactive immadiately. There must be an extended
+period of no transfers before it is considered inactive and exempt from the
+queuing limits.
 
 fast resume
 ===========
@@ -427,7 +539,7 @@
 versions of libtorrent. It's still described in here for completeness.
 
 The allocation mode is selected when a torrent is started. It is passed as an
-argument to `session::add_torrent()`__ or `session::async_add_torrent()`__.
+argument to session::add_torrent() or session::async_add_torrent().
 
 The decision to use full allocation or compact allocation typically depends on
 whether any files have priority 0 and if the filesystem supports sparse files.
@@ -471,8 +583,7 @@
 ------------------
 
 .. note::
-	Note that support for compact allocation is deprecated in libttorrent, and will
-	be removed in future versions.
+	Support for compact allocation has been removed from libttorrent
 
 The compact allocation will only allocate as much storage as it needs to keep
 the pieces downloaded so far. This means that pieces will be moved around to be
@@ -544,6 +655,43 @@
 .. _`BEP 17`: http://bittorrent.org/beps/bep_0017.html
 .. _`BEP 19`: http://bittorrent.org/beps/bep_0019.html
 
+dynamic loading of torrent files
+================================
+
+libtorrent has a feature that can unload idle torrents from memory. The purpose
+of this is to support being active on many more torrents than the RAM permits.
+This is useful for both embedded devices that have limited RAM and servers
+seeding tens of thousands of torrents.
+
+The most significant parts of loaded torrents that use RAM are the piece
+hashes (20 bytes per piece) and the file list. The entire info-dictionary
+of the .torrent file is kept in RAM.
+
+In order to activate the dynamic loading of torrent files, set the load
+function on the `session`__. See `set_load_function()`__.
+
+When a load function is set on the `session`__, the dynamic load/unload
+feature is enabled. Torrents are kept in an LRU. Every time an operation
+is performed, on a torrent or from a peer, that requires the metadata of
+the torrent to be loaded, the torrent is bumped up in the LRU. When a torrent
+is paused or queued, it is demoted to the least recently used torrent in
+the LRU, since it's a good candidate for eviction.
+
+To configure how many torrents are allowed to be loaded at the same time,
+set `settings_pack::active_loaded_limit`__ on the `session`__.
+
+Torrents can be exempt from being unloaded by being *pinned*. Pinned torrents
+still count against the limit, but are never considered for eviction.
+You can either pin a torrent when adding it, in ``add_torrent_params``
+(see `async_add_torrent()`__ and `add_torrent()`__), or after ading it with the
+`set_pinned()`__ function on `torrent_handle`__.
+
+Torrents that start out without metadata (e.g. magnet links or http downloads)
+are automatically pinned. This is important in order to give the client a
+chance to save the metadata to disk once it's received (see `metadata_received_alert`__).
+
+Once the metadata is saved to disk, it might make sense to unpin the torrent.
+
 piece picker
 ============
 
@@ -592,7 +740,7 @@
 ramp-up time. The heuristic to mitigate this problem is to, for the first few
 pieces, pick random pieces rather than rare pieces. The threshold for when to
 leave this initial picker mode is determined by
-`session_settings::initial_picker_threshold`__.
+`settings_pack::initial_picker_threshold`__.
 
 reverse order
 -------------
@@ -611,7 +759,7 @@
 Peers that have participated in a piece that failed the hash check, may be put
 in *parole mode*. This means we prefer downloading a full piece  from this
 peer, in order to distinguish which peer is sending corrupt data. Whether to do
-this is or not is controlled by `session_settings::use_parole_mode`__.
+this is or not is controlled by `settings_pack::use_parole_mode`__.
 
 In parole mode, the piece picker prefers picking one whole piece at a time for
 a given peer, avoiding picking any blocks from a piece any other peer has
@@ -626,7 +774,7 @@
 downloading a block until it can be uploaded to others is minimized). It also
 puts less stress on the disk cache, since fewer partial pieces need to be kept
 in the cache. Whether or not to enable this is controlled by
-`session_settings::prioritize_partial_pieces`__.
+setting_pack::prioritize_partial_pieces.
 
 The main benefit of not prioritizing partial pieces is that the rarest first
 algorithm gets to have more influence on which pieces are picked. The picker is
@@ -651,11 +799,80 @@
 The main advantage is that these peers will better utilize the other peer's
 disk cache, by requesting all blocks in a single piece, from the same peer.
 
-This threshold is controlled by `session_settings::whole_pieces_threshold`__.
+This threshold is controlled by the `settings_pack::whole_pieces_threshold`__
+setting.
 
-*TODO: piece affinity by speed category*
 *TODO: piece priorities*
 
+predictive piece announce
+=========================
+
+In order to improve performance, libtorrent supports a feature called
+``predictive piece announce``. When enabled, it will make libtorrent announce
+that we have pieces to peers, before we truly have them. The most important
+case is to announce a piece as soon as it has been downloaded and passed the
+hash check, but not yet been written to disk. In this case, there is a risk the
+piece will fail to be written to disk, in which case we won't have the piece
+anymore, even though we announced it to peers.
+
+The other case is when we're very close to completing the download of a piece
+and assume it will pass the hash check, we can announce it to peers to make it
+available one round-trip sooner than otherwise. This lets libtorrent start
+uploading the piece to interested peers immediately when the piece complete,
+instead of waiting one round-trip for the peers to request it.
+
+This makes for the implementation slightly more complicated, since piece will
+have more states and more complicated transitions. For instance, a piece could
+be:
+
+1. hashed but not fully written to disk
+2. fully written to disk but not hashed
+3. not fully downloaded
+4. downloaded and hash checked
+
+Once a piece is fully downloaded, the hash check could complete before any of
+the write operations or it could complete after all write operations are
+complete.
+
+peer classes
+============
+
+The peer classes feature in libtorrent allows a client to define custom groups
+of peers and rate limit them individually. Each such group is called a *peer
+class*. There are a few default peer classes that are always created:
+
+* global - all peers belong to this class, except peers on the local network
+* local peers - all peers on the local network belongs to this class TCP peers
+* - all peers connected over TCP belong to this class
+
+The TCP peers class is used by the uTP/TCP balancing logic, if it's enabled, to
+throttle TCP peers. The global and local classes are used to adjust the global
+rate limits.
+
+When the rate limits are adjusted for a specific torrent, a class is created
+implicitly for that torrent.
+
+The default peer class IDs are defined as enums in the ``session`` class::
+
+	enum {
+		global_peer_class_id,
+		tcp_peer_class_id,
+		local_peer_class_id
+	};
+
+A peer class can be considered a more general form of *lables* that some
+clients have. Peer classes however are not just applied to torrents, but
+ultimately the peers.
+
+Peer classes can be created with the `create_peer_class()`__ call (on the `session`__
+object), and deleted with the `delete_peer_class()`__ call.
+
+Peer classes are configured with the `set_peer_class()`__ `get_peer_class()`__ calls.
+
+Custom peer classes can be assigned to torrents, with the ??? call, in which
+case all its peers will belong to the class. They can also be assigned based on
+the peer's IP address. See `set_peer_class_filter()`__ for more information.
+
 SSL torrents
 ============
 
@@ -684,7 +901,7 @@
 
 SSL connections are accepted on a separate socket from normal bittorrent
 connections. To pick which port the SSL socket should bind to, set
-`session_settings::ssl_listen`__ to a different port. It defaults to port 4433.
+`settings_pack::ssl_listen`__ to a different port. It defaults to port 4433.
 This setting is only taken into account when the normal listen socket is opened
 (i.e. just changing this setting won't necessarily close and re-open the SSL
 socket). To not listen on an SSL socket at all, set ``ssl_listen`` to 0.
@@ -741,58 +958,135 @@
 The peer's certificate is located in ``./newcert.pem`` and the certificate's
 private key in ``./newkey.pem``.
 
-__ reference-Session.html#session
-__ reference-Session.html#session
-__ reference-Session.html#load_state()
+session statistics
+==================
+
+libtorrent provides a mechanism to query performance and statistics counters
+from its internals. This is primarily useful for troubleshooting of production
+systems and performance tuning.
+
+The statistics consists of two fundamental types. *counters* and *gauges*. A
+counter is a monotonically increasing value, incremented every time some event
+occurs. For example, every time the network thread wakes up because a socket
+became readable will increment a counter. Another example is every time a
+socket receives *n* bytes, a counter is incremented by *n*.
+
+*Counters* are the most flexible of metrics. It allows the program to sample
+the counter at any interval, and calculate average rates of increments to the
+counter. Some events may be rare and need to be sampled over a longer period in
+order to get userful rates, where other events may be more frequent and evenly
+distributed that sampling it frequently yields useful values. Counters also
+provides accurate overall counts. For example, converting samples of a download
+rate into a total transfer count is not accurate and takes more samples.
+Converting an increasing counter into a rate is easy and flexible.
+
+*Gauges* measure the instantaneous state of some kind. This is used for metrics
+that are not counting events or flows, but states that can fluctuate. For
+example, the number of torrents that are currenly being downloaded.
+
+It's important to know whether a value is a counter or a gauge in order to
+interpret it correctly. In order to query libtorrent for which counters and
+gauges are available, call `session_stats_metrics()`__. This will return metadata
+about the values available for inspection in libtorrent. It will include
+whether a value is a counter or a gauge. The key information it includes is the
+index used to extract the actual measurements for a specific counter or gauge.
+
+In order to take a sample, call `post_session_stats()`__ in the `session`__ object.
+This will result in a `session_stats_alert`__ being posted. In this `alert`__ object,
+there is an array of values, these values make up the sample. The value index
+in the stats metric indicates which index the metric's value is stored in.
+
+The mapping between metric and value is not stable across versions of
+libtorrent. Always query the metrics first, to find out the index at which the
+value is stored, before interpreting the values array in the
+`session_stats_alert`__. The mapping will *not* change during the runtime of your
+process though, it's tied to a specific libtorrent version. You only have to
+query the mapping once on startup (or every time ``libtorrent.so`` is loaded,
+if it's done dynamically).
+
+The available stats metrics are:
+
+.. include:: stats_counters.rst
+
+
+__ reference-Core.html#session
+__ reference-Core.html#session
+__ reference-Core.html#load_state()
 __ reference-Core.html#add_extension()
-__ reference-Session.html#start_dht()
-__ reference-Session.html#start_lsd()
-__ reference-Session.html#start_upnp()
-__ reference-Session.html#start_natpmp()
-__ reference-Session.html#session
+__ reference-Core.html#session
 __ reference-Core.html#torrent_info
-__ reference-Session.html#async_add_torrent()
-__ reference-Session.html#add_torrent()
-__ reference-Session.html#session
-__ reference-Session.html#wait_for_alert()
-__ reference-Session.html#pop_alerts()
+__ reference-Core.html#async_add_torrent()
+__ reference-Core.html#add_torrent()
+__ reference-Core.html#session
+__ reference-Core.html#wait_for_alert()
+__ reference-Core.html#pop_alerts()
 __ reference-Alerts.html#state_update_alert
 __ reference-Alerts.html#alert
-__ reference-Session.html#session
-__ reference-Session.html#status()
-__ reference-Session.html#session
-__ reference-Session.html#remove_torrent()
+__ reference-Core.html#session
+__ reference-Core.html#session
+__ reference-Core.html#remove_torrent()
 __ reference-Core.html#save_resume_data()
-__ reference-Session.html#session
-__ reference-Session.html#save_state()
-__ reference-Session.html#session
+__ reference-Core.html#session
+__ reference-Core.html#save_state()
+__ reference-Core.html#session
 __ reference-Create_Torrents.html#create_torrent
 __ reference-Core.html#set_upload_mode()
 __ reference-Error_Codes.html#libtorrent_exception
 __ reference-Error_Codes.html#error_code_enum
-__ reference-Session.html#async_add_torrent()
-__ reference-Session.html#add_torrent()
-__ reference-Settings.html#session_settings
-__ reference-Settings.html#session_settings
+__ reference-Core.html#flag_auto_managed
+__ reference-Core.html#queue_position
+__ reference-Settings.html#active_limit
+__ reference-Settings.html#auto_manage_interval
 __ reference-Core.html#save_resume_data()
 __ reference-Core.html#queue_position()
 __ reference-Core.html#queue_position_up()
 __ reference-Core.html#queue_position_down()
 __ reference-Core.html#queue_position_top()
 __ reference-Core.html#queue_position_bottom()
-__ reference-Settings.html#session_settings
+__ reference-Core.html#allocating
+__ reference-Settings.html#active_downloads
+__ reference-Core.html#queue_position
+__ reference-Core.html#queue_position
+__ reference-Settings.html#active_seeds
+__ reference-Settings.html#share_ratio_limit
+__ reference-Settings.html#seed_time_ratio_limit
+__ reference-Settings.html#seed_time_limit
+__ reference-Settings.html#active_tracker_limit
+__ reference-Settings.html#active_dht_limit
+__ reference-Settings.html#active_lsd_limit
+__ reference-Settings.html#auto_manage_prefer_seeds
+__ reference-Settings.html#dont_count_slow_torrents
 __ reference-Core.html#save_resume_data()
 __ reference-Core.html#torrent_handle
-__ reference-Session.html#async_add_torrent()
-__ reference-Session.html#add_torrent()
-__ reference-Session.html#add_torrent()
-__ reference-Session.html#async_add_torrent()
+__ reference-Core.html#async_add_torrent()
+__ reference-Core.html#add_torrent()
+__ reference-Core.html#session
+__ reference-Core.html#set_load_function()
+__ reference-Core.html#session
+__ reference-Settings.html#active_loaded_limit
+__ reference-Core.html#session
+__ reference-Core.html#async_add_torrent()
+__ reference-Core.html#add_torrent()
+__ reference-Core.html#set_pinned()
+__ reference-Core.html#torrent_handle
+__ reference-Alerts.html#metadata_received_alert
 __ reference-Settings.html#initial_picker_threshold
 __ reference-Settings.html#use_parole_mode
-__ reference-Settings.html#prioritize_partial_pieces
 __ reference-Settings.html#whole_pieces_threshold
+__ reference-Core.html#create_peer_class()
+__ reference-Core.html#session
+__ reference-Core.html#delete_peer_class()
+__ reference-Core.html#set_peer_class()
+__ reference-Core.html#get_peer_class()
+__ reference-Core.html#set_peer_class_filter()
 __ reference-Core.html#set_ssl_certificate()
 __ reference-Core.html#torrent_handle
 __ reference-Alerts.html#torrent_need_cert_alert
 __ reference-Settings.html#ssl_listen
+__ reference-Core.html#session_stats_metrics()
+__ reference-Core.html#post_session_stats()
+__ reference-Core.html#session
+__ reference-Alerts.html#session_stats_alert
+__ reference-Alerts.html#alert
+__ reference-Alerts.html#session_stats_alert
 
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Alerts.html libtorrent-rasterbar-1.0.7/docs/reference-Alerts.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Alerts.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Alerts.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Bencoding.html libtorrent-rasterbar-1.0.7/docs/reference-Bencoding.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Bencoding.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Bencoding.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Core.html libtorrent-rasterbar-1.0.7/docs/reference-Core.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Core.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Core.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Create_Torrents.html libtorrent-rasterbar-1.0.7/docs/reference-Create_Torrents.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Create_Torrents.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Create_Torrents.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Custom_Storage.html libtorrent-rasterbar-1.0.7/docs/reference-Custom_Storage.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Custom_Storage.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Custom_Storage.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Error_Codes.html libtorrent-rasterbar-1.0.7/docs/reference-Error_Codes.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Error_Codes.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Error_Codes.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Filter.html libtorrent-rasterbar-1.0.7/docs/reference-Filter.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Filter.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Filter.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Plugins.html libtorrent-rasterbar-1.0.7/docs/reference-Plugins.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Plugins.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Plugins.html	2015-11-14 05:21:45.000000000 +0000
@@ -43,7 +43,7 @@
 <tbody valign="top">
 <tr class="field"><th class="field-name">Author:</th><td class="field-body">Arvid Norberg, <a class="reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td>
 </tr>
-<tr class="field"><th class="field-name">Version:</th><td class="field-body">1.0.6</td>
+<tr class="field"><th class="field-name">Version:</th><td class="field-body">1.0.7</td>
 </tr>
 </tbody>
 </table>
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-RSS.html libtorrent-rasterbar-1.0.7/docs/reference-RSS.html
--- libtorrent-rasterbar-1.0.6/docs/reference-RSS.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-RSS.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Session.html libtorrent-rasterbar-1.0.7/docs/reference-Session.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Session.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Session.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,20 +42,20 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
 <p class="topic-title first">Table of contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#add-torrent-params" id="id173">add_torrent_params</a></li>
-<li><a class="reference internal" href="#cache-status" id="id174">cache_status</a></li>
-<li><a class="reference internal" href="#session-proxy" id="id175">session_proxy</a></li>
-<li><a class="reference internal" href="#id38" id="id176">session</a></li>
-<li><a class="reference internal" href="#dht-lookup" id="id177">dht_lookup</a></li>
-<li><a class="reference internal" href="#dht-routing-bucket" id="id178">dht_routing_bucket</a></li>
-<li><a class="reference internal" href="#utp-status" id="id179">utp_status</a></li>
-<li><a class="reference internal" href="#session-status" id="id180">session_status</a></li>
+<li><a class="reference internal" href="#add-torrent-params" id="id176">add_torrent_params</a></li>
+<li><a class="reference internal" href="#cache-status" id="id177">cache_status</a></li>
+<li><a class="reference internal" href="#session-proxy" id="id178">session_proxy</a></li>
+<li><a class="reference internal" href="#id41" id="id179">session</a></li>
+<li><a class="reference internal" href="#dht-lookup" id="id180">dht_lookup</a></li>
+<li><a class="reference internal" href="#dht-routing-bucket" id="id181">dht_routing_bucket</a></li>
+<li><a class="reference internal" href="#utp-status" id="id182">utp_status</a></li>
+<li><a class="reference internal" href="#session-status" id="id183">session_status</a></li>
 </ul>
 </div>
 <a name="add_torrent_params"></a><div class="section" id="add-torrent-params">
@@ -100,6 +100,7 @@
       flag_super_seeding,
       flag_sequential_download,
       flag_use_resume_save_path,
+      flag_merge_resume_http_seeds,
    };
 
    int version;
@@ -140,9 +141,9 @@
 <p>Declared in &quot;<a class="reference external" href="../include/libtorrent/add_torrent_params.hpp">libtorrent/add_torrent_params.hpp</a>&quot;</p>
 <table border="1" class="docutils">
 <colgroup>
-<col width="25%" />
+<col width="27%" />
 <col width="6%" />
-<col width="68%" />
+<col width="67%" />
 </colgroup>
 <thead valign="bottom">
 <tr><th class="head">name</th>
@@ -257,7 +258,11 @@
 <td>256</td>
 <td>defaults to off and specifies whether tracker URLs loaded from
 resume data should be added to the trackers in the torrent or
-replace the trackers.</td>
+replace the trackers. When replacing trackers (i.e. this flag is not
+set), any trackers passed in via <a class="reference external" href="reference-Session.html#add_torrent_params">add_torrent_params</a> are also
+replaced by any trackers in the resume data. The default behavior is
+to have the resume data override the .torrent file _and_ the
+trackers added in <a class="reference external" href="reference-Session.html#add_torrent_params">add_torrent_params</a>.</td>
 </tr>
 <tr><td>flag_update_subscribe</td>
 <td>512</td>
@@ -283,6 +288,17 @@
 present, is honored. This defaults to not being set, in which
 case the save_path specified in <a class="reference external" href="reference-Session.html#add_torrent_params">add_torrent_params</a> is always used.</td>
 </tr>
+<tr><td>flag_merge_resume_http_seeds</td>
+<td>8192</td>
+<td>defaults to off and specifies whether web seed URLs loaded from
+resume data should be added to the ones in the torrent file or
+replace them. No distinction is made between the two different kinds
+of web seeds (<a class="reference external" href="http://bittorrent.org/beps/bep_0017.html">BEP 17</a> and <a class="reference external" href="http://bittorrent.org/beps/bep_0019.html">BEP 19</a>). When replacing web seeds
+(i.e. when this flag is not set), any web seeds passed in via
+<a class="reference external" href="reference-Session.html#add_torrent_params">add_torrent_params</a> are also replaced. The default behavior is to
+have any web seeds in the resume data take presedence over whatever
+is passed in here as well as the .torrent file.</td>
+</tr>
 </tbody>
 </table>
 <a name="version"></a><dl class="docutils">
@@ -455,7 +471,7 @@
    int read_queue_size;
 };
 </pre>
-<a name="cache_status()"></a><div class="section" id="id25">
+<a name="cache_status()"></a><div class="section" id="id28">
 <h2>cache_status()</h2>
 <pre class="literal-block">
 <strong>cache_status</strong> ();
@@ -577,7 +593,7 @@
    <strong>session_proxy</strong> ();
 };
 </pre>
-<a name="session_proxy()"></a><div class="section" id="id36">
+<a name="session_proxy()"></a><div class="section" id="id39">
 <h2>session_proxy()</h2>
 <pre class="literal-block">
 <strong>session_proxy</strong> ();
@@ -586,7 +602,7 @@
 implementation object.</p>
 <a name="session"></a></div>
 </div>
-<div class="section" id="id38">
+<div class="section" id="id41">
 <h1>session</h1>
 <p>Declared in &quot;<a class="reference external" href="../include/libtorrent/session.hpp">libtorrent/session.hpp</a>&quot;</p>
 <p>The <a class="reference external" href="reference-Session.html#session">session</a> holds all state that spans multiple torrents. Among other
@@ -725,7 +741,7 @@
    };
 };
 </pre>
-<a name="session()"></a><div class="section" id="id42">
+<a name="session()"></a><div class="section" id="id45">
 <h2>session()</h2>
 <pre class="literal-block">
 <strong>session</strong> (fingerprint const&amp; print = fingerprint(&quot;LT&quot;
@@ -759,7 +775,7 @@
 <p>The <tt class="docutils literal">alert_mask</tt> is the same mask that you would send to
 <a class="reference external" href="reference-Session.html#set_alert_mask()">set_alert_mask()</a>.</p>
 <a name="~session()"></a></div>
-<div class="section" id="id44">
+<div class="section" id="id47">
 <h2>~session()</h2>
 <pre class="literal-block">
 <strong>~session</strong> ();
@@ -1047,7 +1063,7 @@
 <p>query the DHT for an immutable item at the <tt class="docutils literal">target</tt> hash.
 the result is posted as a <a class="reference external" href="reference-Alerts.html#dht_immutable_item_alert">dht_immutable_item_alert</a>.</p>
 <a name="dht_get_item()"></a></div>
-<div class="section" id="id99">
+<div class="section" id="id102">
 <h2>dht_get_item()</h2>
 <pre class="literal-block">
 void <strong>dht_get_item</strong> (boost::array&lt;char, 32&gt; key
@@ -1069,7 +1085,7 @@
 up agan. It's just the sha-1 hash of the bencoded form of the
 structure.</p>
 <a name="dht_put_item()"></a></div>
-<div class="section" id="id101">
+<div class="section" id="id104">
 <h2>dht_put_item()</h2>
 <pre class="literal-block">
 void <strong>dht_put_item</strong> (boost::array&lt;char, 32&gt; key
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Settings.html libtorrent-rasterbar-1.0.7/docs/reference-Settings.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Settings.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Settings.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Storage.html libtorrent-rasterbar-1.0.7/docs/reference-Storage.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Storage.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Storage.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-String.html libtorrent-rasterbar-1.0.7/docs/reference-String.html
--- libtorrent-rasterbar-1.0.6/docs/reference-String.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-String.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Time.html libtorrent-rasterbar-1.0.7/docs/reference-Time.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Time.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Time.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/reference-Utility.html libtorrent-rasterbar-1.0.7/docs/reference-Utility.html
--- libtorrent-rasterbar-1.0.6/docs/reference-Utility.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/reference-Utility.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.6</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/todo.html libtorrent-rasterbar-1.0.7/docs/todo.html
--- libtorrent-rasterbar-1.0.6/docs/todo.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/todo.html	2015-11-14 05:21:45.000000000 +0000
@@ -22,7 +22,7 @@
 </head><body>
 <h1>libtorrent todo-list</h1>
 <span style="color: #f77">5 important</span>
-<span style="color: #3c3">8 relevant</span>
+<span style="color: #3c3">9 relevant</span>
 <span style="color: #77f">12 feasible</span>
 <span style="color: #999">45 notes</span>
 <table width="100%" border="1" style="border-collapse: collapse;"><tr style="background: #fdd"><td>relevance&nbsp;4</td><td><a href="javascript:expand(0)">../src/session_impl.cpp:674</a></td><td>in order to support SSL over uTP, the utp_socket manager either needs to be able to receive packets on multiple ports, or we need to peek into the first few bytes the payload stream of a socket to determine whether or not it's an SSL connection. (The former is simpler but won't do as well with NATs)</td></tr><tr id="0" style="display: none;" colspan="3"><td colspan="3"><h2>in order to support SSL over uTP, the utp_socket manager either
@@ -131,9 +131,9 @@
 
 get_out:
 		BN_free(remote_key);
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(2)">../src/torrent.cpp:6315</a></td><td>if peer is a really good peer, maybe we shouldn't disconnect it perhaps this logic should be disabled if we have too many idle peers (with some definition of idle)</td></tr><tr id="2" style="display: none;" colspan="3"><td colspan="3"><h2>if peer is a really good peer, maybe we shouldn't disconnect it
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(2)">../src/torrent.cpp:6396</a></td><td>if peer is a really good peer, maybe we shouldn't disconnect it perhaps this logic should be disabled if we have too many idle peers (with some definition of idle)</td></tr><tr id="2" style="display: none;" colspan="3"><td colspan="3"><h2>if peer is a really good peer, maybe we shouldn't disconnect it
 perhaps this logic should be disabled if we have too many idle peers
-(with some definition of idle)</h2><h4>../src/torrent.cpp:6315</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			return false;
+(with some definition of idle)</h2><h4>../src/torrent.cpp:6396</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			return false;
 		}
 		TORRENT_ASSERT(m_connections.find(p) == m_connections.end());
 		m_connections.insert(p);
@@ -288,7 +288,7 @@
 	boost::uint64_t seq = 0;
 
 	lazy_entry const* r = m.message.dict_find_dict("r");
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(5)">../src/kademlia/routing_table.cpp:873</a></td><td>move the lowest priority nodes to the replacement bucket</td></tr><tr id="5" style="display: none;" colspan="3"><td colspan="3"><h2>move the lowest priority nodes to the replacement bucket</h2><h4>../src/kademlia/routing_table.cpp:873</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	bucket_t&amp; b = m_buckets[bucket_index].live_nodes;
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(5)">../src/kademlia/routing_table.cpp:875</a></td><td>move the lowest priority nodes to the replacement bucket</td></tr><tr id="5" style="display: none;" colspan="3"><td colspan="3"><h2>move the lowest priority nodes to the replacement bucket</h2><h4>../src/kademlia/routing_table.cpp:875</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	bucket_t&amp; b = m_buckets[bucket_index].live_nodes;
 	bucket_t&amp; rb = m_buckets[bucket_index].replacements;
 
 	// move any node whose (160 - distane_exp(m_id, id)) &gt;= (i - m_buckets.begin())
@@ -392,45 +392,47 @@
 		if (!ent.symlink_path.empty() &amp;&amp; m_symlinks.size() &lt; internal_file_entry::not_a_symlink - 1)
 		{
 			e.symlink_index = m_symlinks.size();
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(7)">../src/torrent.cpp:672</a></td><td>post alert</td></tr><tr id="7" style="display: none;" colspan="3"><td colspan="3"><h2>post alert</h2><h4>../src/torrent.cpp:672</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		state_updated();
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(7)">../src/torrent.cpp:674</a></td><td>post alert</td></tr><tr id="7" style="display: none;" colspan="3"><td colspan="3"><h2>post alert</h2><h4>../src/torrent.cpp:674</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+		state_updated();
 
 		set_state(torrent_status::downloading);
 
-		m_override_resume_data = true;
 		init();
 	}
 
 #endif // if 0
 
-	void torrent::leave_seed_mode(bool seed)
+	void torrent::leave_seed_mode(bool skip_checking)
 	{
 		if (!m_seed_mode) return;
 
-		if (!seed)
+		if (!skip_checking)
 		{
 			// this means the user promised we had all the
 			// files, but it turned out we didn't. This is
 			// an error.
 
-<div style="background: #ffff00" width="100%">		
+<div style="background: #ffff00" width="100%">
 </div>#if defined TORRENT_ERROR_LOGGING
 			debug_log("*** FAILED SEED MODE, rechecking");
 #endif
 		}
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-		debug_log("*** LEAVING SEED MODE (%s)", seed ? "as seed" : "as non-seed");
+		debug_log("*** LEAVING SEED MODE (%s)", m_seed_mode ? "as seed" : "as non-seed");
 #endif
 		m_seed_mode = false;
 		// seed is false if we turned out not
 		// to be a seed after all
-		if (!seed)
+		if (!skip_checking)
 		{
 			set_state(torrent_status::downloading);
 			force_recheck();
 		}
 		m_num_verified = 0;
 		m_verified.clear();
+
+		m_policy.recalculate_connect_candidates();
 	}
 
 	void torrent::verified(int piece)
@@ -441,8 +443,6 @@
 		++m_num_verified;
 		m_verified.set_bit(piece);
 	}
-
-	void torrent::start()
 </pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(8)">../src/web_peer_connection.cpp:634</a></td><td>create a mapping of file-index to redirection URLs. Use that to form URLs instead. Support to reconnect to a new server without destructing this peer_connection</td></tr><tr id="8" style="display: none;" colspan="3"><td colspan="3"><h2>create a mapping of file-index to redirection URLs. Use that to form
 URLs instead. Support to reconnect to a new server without destructing this
 peer_connection</h2><h4>../src/web_peer_connection.cpp:634</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">						m_web = NULL;
@@ -703,7 +703,58 @@
 	memcpy(&amp;in[20-4], &amp;secret_hash[0], 4);
 	memcpy(&amp;in[20-8], &amp;rand, 4);
 }
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(13)">../include/libtorrent/session.hpp:215</a></td><td>the ip filter should probably be saved here too</td></tr><tr id="13" style="display: none;" colspan="3"><td colspan="3"><h2>the ip filter should probably be saved here too</h2><h4>../include/libtorrent/session.hpp:215</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			TORRENT_LOGPATH_ARG_DEFAULT)
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(13)">../include/libtorrent/peer_connection.hpp:1162</a></td><td>rename this target queue size</td></tr><tr id="13" style="display: none;" colspan="3"><td colspan="3"><h2>rename this target queue size</h2><h4>../include/libtorrent/peer_connection.hpp:1162</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// in the session_settings structure. But it may be lowered
+		// if the peer is known to require a smaller limit (like BitComet).
+		// or if the extended handshake sets a limit.
+		// web seeds also has a limit on the queue size.
+		int m_max_out_request_queue;
+
+		// when using the BitTyrant choker, this is our
+		// estimated reciprocation rate. i.e. the rate
+		// we need to send to this peer for it to unchoke
+		// us
+		int m_est_reciprocation_rate;
+
+		// estimated round trip time to this peer
+		// based on the time from when async_connect
+		// was called to when on_connection_complete
+		// was called. The rtt is specified in milliseconds
+		boost::uint16_t m_rtt;
+
+		// the number of request we should queue up
+		// at the remote end.
+<div style="background: #ffff00" width="100%">		boost::uint16_t m_desired_queue_size;
+</div>
+#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES	
+		// in case the session settings is set
+		// to resolve countries, this is set to
+		// the two character country code this
+		// peer resides in.
+		char m_country[2];
+#endif
+
+		// if set to non-zero, this peer will always prefer
+		// to request entire n pieces, rather than blocks.
+		// where n is the value of this variable.
+		// if it is 0, the download rate limit setting
+		// will be used to determine if whole pieces
+		// are preferred.
+		boost::uint8_t m_prefer_whole_pieces;
+		
+		// if this is true, the disconnection
+		// timestamp is not updated when the connection
+		// is closed. This means the time until we can
+		// reconnect to this peer is shorter, and likely
+		// immediate.
+		bool m_fast_reconnect:1;
+		
+		// is true if it was we that connected to the peer
+		// and false if we got an incoming connection
+		// could be considered: true = local, false = remote
+		bool m_outgoing:1;
+
+		// if this is set to true, the peer will not
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(14)">../include/libtorrent/session.hpp:215</a></td><td>the ip filter should probably be saved here too</td></tr><tr id="14" style="display: none;" colspan="3"><td colspan="3"><h2>the ip filter should probably be saved here too</h2><h4>../include/libtorrent/session.hpp:215</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			TORRENT_LOGPATH_ARG_DEFAULT)
 		{
 			TORRENT_CFG();
 			TORRENT_ASSERT(listen_port_range.first &gt; 0);
@@ -754,7 +805,7 @@
 			save_feeds =        0x080
 
 #ifndef TORRENT_NO_DEPRECATE
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(14)">../src/http_seed_connection.cpp:115</a></td><td>in chunked encoding mode, this assert won't hold. the chunk headers should be subtracted from the receive_buffer_size</td></tr><tr id="14" style="display: none;" colspan="3"><td colspan="3"><h2>in chunked encoding mode, this assert won't hold.
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(15)">../src/http_seed_connection.cpp:115</a></td><td>in chunked encoding mode, this assert won't hold. the chunk headers should be subtracted from the receive_buffer_size</td></tr><tr id="15" style="display: none;" colspan="3"><td colspan="3"><h2>in chunked encoding mode, this assert won't hold.
 the chunk headers should be subtracted from the receive_buffer_size</h2><h4>../src/http_seed_connection.cpp:115</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	boost::optional&lt;piece_block_progress&gt;
 	http_seed_connection::downloading_piece_progress() const
 	{
@@ -806,8 +857,8 @@
 		std::string request;
 		request.reserve(400);
 
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(15)">../src/peer_connection.cpp:2611</a></td><td>peers should really be corked/uncorked outside of all completed disk operations</td></tr><tr id="15" style="display: none;" colspan="3"><td colspan="3"><h2>peers should really be corked/uncorked outside of
-all completed disk operations</h2><h4>../src/peer_connection.cpp:2611</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		}
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(16)">../src/peer_connection.cpp:2615</a></td><td>peers should really be corked/uncorked outside of all completed disk operations</td></tr><tr id="16" style="display: none;" colspan="3"><td colspan="3"><h2>peers should really be corked/uncorked outside of
+all completed disk operations</h2><h4>../src/peer_connection.cpp:2615</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		}
 
 		if (is_disconnecting()) return;
 
@@ -858,8 +909,8 @@
 			return;
 		}
 
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(16)">../src/session_impl.cpp:5611</a></td><td>report the proper address of the router as the source IP of this understanding of our external address, instead of the empty address</td></tr><tr id="16" style="display: none;" colspan="3"><td colspan="3"><h2>report the proper address of the router as the source IP of
-this understanding of our external address, instead of the empty address</h2><h4>../src/session_impl.cpp:5611</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	void session_impl::on_port_mapping(int mapping, address const&amp; ip, int port
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(17)">../src/session_impl.cpp:5616</a></td><td>report the proper address of the router as the source IP of this understanding of our external address, instead of the empty address</td></tr><tr id="17" style="display: none;" colspan="3"><td colspan="3"><h2>report the proper address of the router as the source IP of
+this understanding of our external address, instead of the empty address</h2><h4>../src/session_impl.cpp:5616</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	void session_impl::on_port_mapping(int mapping, address const&amp; ip, int port
 		, error_code const&amp; ec, int map_transport)
 	{
 		TORRENT_ASSERT(is_network_thread());
@@ -910,9 +961,9 @@
 	{
 //		INVARIANT_CHECK;
 		TORRENT_ASSERT(is_network_thread());
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(17)">../src/session_impl.cpp:6400</a></td><td>we only need to do this if our global IPv4 address has changed since the DHT (currently) only supports IPv4. Since restarting the DHT is kind of expensive, it would be nice to not do it unnecessarily</td></tr><tr id="17" style="display: none;" colspan="3"><td colspan="3"><h2>we only need to do this if our global IPv4 address has changed
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(18)">../src/session_impl.cpp:6405</a></td><td>we only need to do this if our global IPv4 address has changed since the DHT (currently) only supports IPv4. Since restarting the DHT is kind of expensive, it would be nice to not do it unnecessarily</td></tr><tr id="18" style="display: none;" colspan="3"><td colspan="3"><h2>we only need to do this if our global IPv4 address has changed
 since the DHT (currently) only supports IPv4. Since restarting the DHT
-is kind of expensive, it would be nice to not do it unnecessarily</h2><h4>../src/session_impl.cpp:6400</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#endif
+is kind of expensive, it would be nice to not do it unnecessarily</h2><h4>../src/session_impl.cpp:6405</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#endif
 
 		if (!m_external_ip.cast_vote(ip, source_type, source)) return;
 
@@ -963,11 +1014,11 @@
 
 #ifdef TORRENT_DISK_STATS
 		TORRENT_ASSERT(m_buffer_allocations &gt;= 0);
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(18)">../src/torrent.cpp:1069</a></td><td>make this depend on the error and on the filesystem the files are being downloaded to. If the error is no_space_left_on_device and the filesystem doesn't support sparse files, only zero the priorities of the pieces that are at the tails of all files, leaving everything up to the highest written piece in each file</td></tr><tr id="18" style="display: none;" colspan="3"><td colspan="3"><h2>make this depend on the error and on the filesystem the
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(19)">../src/torrent.cpp:1073</a></td><td>make this depend on the error and on the filesystem the files are being downloaded to. If the error is no_space_left_on_device and the filesystem doesn't support sparse files, only zero the priorities of the pieces that are at the tails of all files, leaving everything up to the highest written piece in each file</td></tr><tr id="19" style="display: none;" colspan="3"><td colspan="3"><h2>make this depend on the error and on the filesystem the
 files are being downloaded to. If the error is no_space_left_on_device
 and the filesystem doesn't support sparse files, only zero the priorities
 of the pieces that are at the tails of all files, leaving everything
-up to the highest written piece in each file</h2><h4>../src/torrent.cpp:1069</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (c) c-&gt;disconnect(errors::no_memory);
+up to the highest written piece in each file</h2><h4>../src/torrent.cpp:1073</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (c) c-&gt;disconnect(errors::no_memory);
 			return;
 		}
 
@@ -1018,8 +1069,8 @@
 		{
 			int size = m_torrent_file-&gt;piece_size(r.piece);
 			if (rp-&gt;fail)
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(19)">../src/torrent.cpp:5564</a></td><td>save the send_stats state instead of throwing them away it may pose an issue when downgrading though</td></tr><tr id="19" style="display: none;" colspan="3"><td colspan="3"><h2>save the send_stats state instead of throwing them away
-it may pose an issue when downgrading though</h2><h4>../src/torrent.cpp:5564</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					for (int k = 0; k &lt; bits; ++k)
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(20)">../src/torrent.cpp:5646</a></td><td>save the send_stats state instead of throwing them away it may pose an issue when downgrading though</td></tr><tr id="20" style="display: none;" colspan="3"><td colspan="3"><h2>save the send_stats state instead of throwing them away
+it may pose an issue when downgrading though</h2><h4>../src/torrent.cpp:5646</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					for (int k = 0; k &lt; bits; ++k)
 						v |= (i-&gt;info[j*8+k].state == piece_picker::block_info::state_finished)
 						? (1 &lt;&lt; k) : 0;
 					bitmask.append(1, v);
@@ -1070,9 +1121,9 @@
 		// write have bitmask
 		// the pieces string has one byte per piece. Each
 		// byte is a bitmask representing different properties
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(20)">../src/torrent.cpp:6504</a></td><td>should disconnect all peers that have the pieces we have not just seeds. It would be pretty expensive to check all pieces for all peers though</td></tr><tr id="20" style="display: none;" colspan="3"><td colspan="3"><h2>should disconnect all peers that have the pieces we have
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(21)">../src/torrent.cpp:6585</a></td><td>should disconnect all peers that have the pieces we have not just seeds. It would be pretty expensive to check all pieces for all peers though</td></tr><tr id="21" style="display: none;" colspan="3"><td colspan="3"><h2>should disconnect all peers that have the pieces we have
 not just seeds. It would be pretty expensive to check all pieces
-for all peers though</h2><h4>../src/torrent.cpp:6504</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		TORRENT_ASSERT(m_state != torrent_status::finished &amp;&amp; m_state != torrent_status::seeding);
+for all peers though</h2><h4>../src/torrent.cpp:6585</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		TORRENT_ASSERT(m_state != torrent_status::finished &amp;&amp; m_state != torrent_status::seeding);
 
 		set_state(torrent_status::finished);
 		set_queue_position(-1);
@@ -1114,16 +1165,16 @@
 
 		m_policy.recalculate_connect_candidates();
 
-		TORRENT_ASSERT(m_storage);
-		// we need to keep the object alive during this operation
-		m_storage-&gt;async_release_files(
-			boost::bind(&amp;torrent::on_files_released, shared_from_this(), _1, _2));
-		
+		if (m_storage)
+		{
+			// we need to keep the object alive during this operation
+			m_storage-&gt;async_release_files(
+				boost::bind(&amp;torrent::on_files_released, shared_from_this(), _1, _2));
+		}
+
 		// this torrent just completed downloads, which means it will fall
 		// under a different limit with the auto-manager. Make sure we
-		// update auto-manage torrents in that case
-		if (m_auto_managed)
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(21)">../src/torrent_info.cpp:164</a></td><td>we might save constructing a std::string if this would take a char const* instead</td></tr><tr id="21" style="display: none;" colspan="3"><td colspan="3"><h2>we might save constructing a std::string if this would take a char const* instead</h2><h4>../src/torrent_info.cpp:164</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(22)">../src/torrent_info.cpp:164</a></td><td>we might save constructing a std::string if this would take a char const* instead</td></tr><tr id="22" style="display: none;" colspan="3"><td colspan="3"><h2>we might save constructing a std::string if this would take a char const* instead</h2><h4>../src/torrent_info.cpp:164</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 			// encode codepoint into utf-8
 			cp = &amp;codepoint;
 			UTF8 sequence[5];
@@ -1174,7 +1225,7 @@
 				path_element.resize(max_path_len);
 			}
 			else
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(22)">../src/torrent_info.cpp:388</a></td><td>this logic should be a separate step done once the torrent is loaded, and the original filenames should be preserved!</td></tr><tr id="22" style="display: none;" colspan="3"><td colspan="3"><h2>this logic should be a separate step
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(23)">../src/torrent_info.cpp:388</a></td><td>this logic should be a separate step done once the torrent is loaded, and the original filenames should be preserved!</td></tr><tr id="23" style="display: none;" colspan="3"><td colspan="3"><h2>this logic should be a separate step
 done once the torrent is loaded, and the original
 filenames should be preserved!</h2><h4>../src/torrent_info.cpp:388</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	
 			while (*s1 != 0 || *s2 != 0)
@@ -1227,7 +1278,7 @@
 
 			// This is a memory optimization! Instead of having
 			// each entry keep a string for its filename, make it
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(23)">../src/torrent_info.cpp:424</a></td><td>once the filename renaming is removed from here this check can be removed as well</td></tr><tr id="23" style="display: none;" colspan="3"><td colspan="3"><h2>once the filename renaming is removed from here
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(24)">../src/torrent_info.cpp:424</a></td><td>once the filename renaming is removed from here this check can be removed as well</td></tr><tr id="24" style="display: none;" colspan="3"><td colspan="3"><h2>once the filename renaming is removed from here
 this check can be removed as well</h2><h4>../src/torrent_info.cpp:424</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// increase the counter
 			int cnt = 0;
 			if (!files.insert(e.path).second)
@@ -1279,7 +1330,7 @@
 	{
 		TORRENT_ASSERT(leafs &gt; 0);
 		return (leafs &lt;&lt; 1) - 1;
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(24)">../include/libtorrent/ip_voter.hpp:124</a></td><td>instead, have one instance per possible subnet, global IPv4, global IPv6, loopback, 192.168.x.x, 10.x.x.x, etc.</td></tr><tr id="24" style="display: none;" colspan="3"><td colspan="3"><h2>instead, have one instance per possible subnet, global IPv4, global IPv6, loopback, 192.168.x.x, 10.x.x.x, etc.</h2><h4>../include/libtorrent/ip_voter.hpp:124</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// away all the votes and started from scratch, in case
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(25)">../include/libtorrent/ip_voter.hpp:124</a></td><td>instead, have one instance per possible subnet, global IPv4, global IPv6, loopback, 192.168.x.x, 10.x.x.x, etc.</td></tr><tr id="25" style="display: none;" colspan="3"><td colspan="3"><h2>instead, have one instance per possible subnet, global IPv4, global IPv6, loopback, 192.168.x.x, 10.x.x.x, etc.</h2><h4>../include/libtorrent/ip_voter.hpp:124</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// away all the votes and started from scratch, in case
 		// our IP has changed
 		ptime m_last_rotate;
 	};
@@ -1306,7 +1357,7 @@
 
 #endif
 
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(25)">../include/libtorrent/web_peer_connection.hpp:130</a></td><td>if we make this be a disk_buffer_holder instead we would save a copy sometimes use allocate_disk_receive_buffer and release_disk_receive_buffer</td></tr><tr id="25" style="display: none;" colspan="3"><td colspan="3"><h2>if we make this be a disk_buffer_holder instead
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(26)">../include/libtorrent/web_peer_connection.hpp:130</a></td><td>if we make this be a disk_buffer_holder instead we would save a copy sometimes use allocate_disk_receive_buffer and release_disk_receive_buffer</td></tr><tr id="26" style="display: none;" colspan="3"><td colspan="3"><h2>if we make this be a disk_buffer_holder instead
 we would save a copy sometimes
 use allocate_disk_receive_buffer and release_disk_receive_buffer</h2><h4>../include/libtorrent/web_peer_connection.hpp:130</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// returns the block currently being
@@ -1359,7 +1410,7 @@
 	};
 }
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(26)">../src/bt_peer_connection.cpp:641</a></td><td>this could be optimized using knuth morris pratt</td></tr><tr id="26" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized using knuth morris pratt</h2><h4>../src/bt_peer_connection.cpp:641</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(27)">../src/bt_peer_connection.cpp:647</a></td><td>this could be optimized using knuth morris pratt</td></tr><tr id="27" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized using knuth morris pratt</h2><h4>../src/bt_peer_connection.cpp:647</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
 			disconnect(errors::no_memory);
 			return;
 		}
@@ -1410,7 +1461,7 @@
 // 		}
 
         // no complete sync
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(27)">../src/bt_peer_connection.cpp:2123</a></td><td>if we're finished, send upload_only message</td></tr><tr id="27" style="display: none;" colspan="3"><td colspan="3"><h2>if we're finished, send upload_only message</h2><h4>../src/bt_peer_connection.cpp:2123</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (msg[5 + k / 8] &amp; (0x80 &gt;&gt; (k % 8))) bitfield_string[k] = '1';
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(28)">../src/bt_peer_connection.cpp:2132</a></td><td>if we're finished, send upload_only message</td></tr><tr id="28" style="display: none;" colspan="3"><td colspan="3"><h2>if we're finished, send upload_only message</h2><h4>../src/bt_peer_connection.cpp:2132</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (msg[5 + k / 8] &amp; (0x80 &gt;&gt; (k % 8))) bitfield_string[k] = '1';
 			else bitfield_string[k] = '0';
 		}
 		peer_log("==&gt; BITFIELD [ %s ]", bitfield_string.c_str());
@@ -1461,8 +1512,8 @@
 				? m_ses.settings().user_agent : m_ses.settings().handshake_client_version;
 		}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(28)">../src/bt_peer_connection.cpp:3363</a></td><td>move the erasing into the loop above remove all payload ranges that has been sent</td></tr><tr id="28" style="display: none;" colspan="3"><td colspan="3"><h2>move the erasing into the loop above
-remove all payload ranges that has been sent</h2><h4>../src/bt_peer_connection.cpp:3363</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			for (std::vector&lt;range&gt;::iterator i = m_payloads.begin();
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(29)">../src/bt_peer_connection.cpp:3378</a></td><td>move the erasing into the loop above remove all payload ranges that has been sent</td></tr><tr id="29" style="display: none;" colspan="3"><td colspan="3"><h2>move the erasing into the loop above
+remove all payload ranges that has been sent</h2><h4>../src/bt_peer_connection.cpp:3378</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			for (std::vector&lt;range&gt;::iterator i = m_payloads.begin();
 				i != m_payloads.end(); ++i)
 			{
 				i-&gt;start -= bytes_transferred;
@@ -1513,7 +1564,7 @@
 			TORRENT_ASSERT(m_sent_handshake);
 		}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(29)">../src/file.cpp:1408</a></td><td>is there any way to pre-fetch data from a file on windows?</td></tr><tr id="29" style="display: none;" colspan="3"><td colspan="3"><h2>is there any way to pre-fetch data from a file on windows?</h2><h4>../src/file.cpp:1408</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(30)">../src/file.cpp:1391</a></td><td>is there any way to pre-fetch data from a file on windows?</td></tr><tr id="30" style="display: none;" colspan="3"><td colspan="3"><h2>is there any way to pre-fetch data from a file on windows?</h2><h4>../src/file.cpp:1391</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 	void file::init_file()
 	{
 		if (m_page_size != 0) return;
@@ -1564,7 +1615,7 @@
 #ifdef TORRENT_DEBUG
 		if (m_open_mode &amp; no_buffer)
 		{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(30)">../src/http_tracker_connection.cpp:97</a></td><td>support authentication (i.e. user name and password) in the URL</td></tr><tr id="30" style="display: none;" colspan="3"><td colspan="3"><h2>support authentication (i.e. user name and password) in the URL</h2><h4>../src/http_tracker_connection.cpp:97</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		, aux::session_impl const&amp; ses
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(31)">../src/http_tracker_connection.cpp:97</a></td><td>support authentication (i.e. user name and password) in the URL</td></tr><tr id="31" style="display: none;" colspan="3"><td colspan="3"><h2>support authentication (i.e. user name and password) in the URL</h2><h4>../src/http_tracker_connection.cpp:97</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		, aux::session_impl const&amp; ses
 		, proxy_settings const&amp; ps
 		, std::string const&amp; auth
 #if TORRENT_USE_I2P
@@ -1615,7 +1666,7 @@
 		if (arguments_start != std::string::npos)
 			url += "&amp;";
 		else
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(31)">../src/i2p_stream.cpp:225</a></td><td>move this to proxy_base and use it in all proxies</td></tr><tr id="31" style="display: none;" colspan="3"><td colspan="3"><h2>move this to proxy_base and use it in all proxies</h2><h4>../src/i2p_stream.cpp:225</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(32)">../src/i2p_stream.cpp:225</a></td><td>move this to proxy_base and use it in all proxies</td></tr><tr id="32" style="display: none;" colspan="3"><td colspan="3"><h2>move this to proxy_base and use it in all proxies</h2><h4>../src/i2p_stream.cpp:225</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 	i2p_stream::i2p_stream(io_service&amp; io_service)
 		: proxy_base(io_service)
 		, m_id(0)
@@ -1666,7 +1717,7 @@
 	void i2p_stream::connected(error_code const&amp; e, boost::shared_ptr&lt;handler_type&gt; h)
 	{
 		TORRENT_ASSERT(m_magic == 0x1337);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(32)">../src/packet_buffer.cpp:176</a></td><td>use compare_less_wrap for this comparison as well</td></tr><tr id="32" style="display: none;" colspan="3"><td colspan="3"><h2>use compare_less_wrap for this comparison as well</h2><h4>../src/packet_buffer.cpp:176</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		while (new_size &lt; size)
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(33)">../src/packet_buffer.cpp:176</a></td><td>use compare_less_wrap for this comparison as well</td></tr><tr id="33" style="display: none;" colspan="3"><td colspan="3"><h2>use compare_less_wrap for this comparison as well</h2><h4>../src/packet_buffer.cpp:176</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		while (new_size &lt; size)
 			new_size &lt;&lt;= 1;
 
 		void** new_storage = (void**)malloc(sizeof(void*) * new_size);
@@ -1717,7 +1768,7 @@
 				if (m_storage[m_last &amp; mask]) break;
 			++m_last;
 			m_last &amp;= 0xffff;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(33)">../src/peer_connection.cpp:997</a></td><td>this should only be peers we're trying to download from</td></tr><tr id="33" style="display: none;" colspan="3"><td colspan="3"><h2>this should only be peers we're trying to download from</h2><h4>../src/peer_connection.cpp:997</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	time_duration peer_connection::download_queue_time(int extra_bytes) const
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(34)">../src/peer_connection.cpp:997</a></td><td>this should only be peers we're trying to download from</td></tr><tr id="34" style="display: none;" colspan="3"><td colspan="3"><h2>this should only be peers we're trying to download from</h2><h4>../src/peer_connection.cpp:997</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	time_duration peer_connection::download_queue_time(int extra_bytes) const
 	{
 		boost::shared_ptr&lt;torrent&gt; t = m_torrent.lock();
 		TORRENT_ASSERT(t);
@@ -1768,9 +1819,9 @@
 	{
 		return m_have_piece;
 	}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(34)">../src/peer_connection.cpp:2774</a></td><td>this might need something more so that once we have the metadata we can construct a full bitfield</td></tr><tr id="34" style="display: none;" colspan="3"><td colspan="3"><h2>this might need something more
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(35)">../src/peer_connection.cpp:2778</a></td><td>this might need something more so that once we have the metadata we can construct a full bitfield</td></tr><tr id="35" style="display: none;" colspan="3"><td colspan="3"><h2>this might need something more
 so that once we have the metadata
-we can construct a full bitfield</h2><h4>../src/peer_connection.cpp:2774</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+we can construct a full bitfield</h2><h4>../src/peer_connection.cpp:2778</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 #ifdef TORRENT_VERBOSE_LOGGING
 		peer_log("*** THIS IS A SEED [ p: %p ]", m_peer_info);
 #endif
@@ -1821,7 +1872,7 @@
 		boost::shared_ptr&lt;torrent&gt; t = m_torrent.lock();
 		TORRENT_ASSERT(t);
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(35)">../src/peer_connection.cpp:2905</a></td><td>sort the allowed fast set in priority order</td></tr><tr id="35" style="display: none;" colspan="3"><td colspan="3"><h2>sort the allowed fast set in priority order</h2><h4>../src/peer_connection.cpp:2905</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// this piece index later
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(36)">../src/peer_connection.cpp:2909</a></td><td>sort the allowed fast set in priority order</td></tr><tr id="36" style="display: none;" colspan="3"><td colspan="3"><h2>sort the allowed fast set in priority order</h2><h4>../src/peer_connection.cpp:2909</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// this piece index later
 		m_allowed_fast.push_back(index);
 
 		// if the peer has the piece and we want
@@ -1872,8 +1923,8 @@
 		TORRENT_ASSERT(t-&gt;has_picker());
 		TORRENT_ASSERT(t-&gt;picker().is_requested(block));
 #endif
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(36)">../src/peer_connection.cpp:4606</a></td><td>peers should really be corked/uncorked outside of all completed disk operations</td></tr><tr id="36" style="display: none;" colspan="3"><td colspan="3"><h2>peers should really be corked/uncorked outside of
-all completed disk operations</h2><h4>../src/peer_connection.cpp:4606</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				// this means we're in seed mode and we haven't yet
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(37)">../src/peer_connection.cpp:4631</a></td><td>peers should really be corked/uncorked outside of all completed disk operations</td></tr><tr id="37" style="display: none;" colspan="3"><td colspan="3"><h2>peers should really be corked/uncorked outside of
+all completed disk operations</h2><h4>../src/peer_connection.cpp:4631</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				// this means we're in seed mode and we haven't yet
 				// verified this piece (r.piece)
 				t-&gt;filesystem().async_read_and_hash(r, boost::bind(&amp;peer_connection::on_disk_read_complete
 					, self(), _1, _2, r), cache.second);
@@ -1924,7 +1975,7 @@
 #endif
 				write_reject_request(r);
 				if (t-&gt;seed_mode()) t-&gt;leave_seed_mode(false);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(37)">../src/policy.cpp:883</a></td><td>only allow _one_ connection to use this override at a time</td></tr><tr id="37" style="display: none;" colspan="3"><td colspan="3"><h2>only allow _one_ connection to use this
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(38)">../src/policy.cpp:883</a></td><td>only allow _one_ connection to use this override at a time</td></tr><tr id="38" style="display: none;" colspan="3"><td colspan="3"><h2>only allow _one_ connection to use this
 override at a time</h2><h4>../src/policy.cpp:883</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				" external: " &lt;&lt; external.external_address(m_peers[candidate]-&gt;address()) &lt;&lt;
 				" t: " &lt;&lt; (session_time - m_peers[candidate]-&gt;last_connected) &lt;&lt;
 				" ]\n";
@@ -1976,7 +2027,7 @@
 		{
 			iter = std::lower_bound(
 				m_peers.begin(), m_peers.end()
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(38)">../src/session_impl.cpp:1775</a></td><td>recalculate all connect candidates for all torrents</td></tr><tr id="38" style="display: none;" colspan="3"><td colspan="3"><h2>recalculate all connect candidates for all torrents</h2><h4>../src/session_impl.cpp:1775</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// #error closing the udp socket here means that
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(39)">../src/session_impl.cpp:1775</a></td><td>recalculate all connect candidates for all torrents</td></tr><tr id="39" style="display: none;" colspan="3"><td colspan="3"><h2>recalculate all connect candidates for all torrents</h2><h4>../src/session_impl.cpp:1775</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// #error closing the udp socket here means that
 		// the uTP connections cannot be closed gracefully
 		m_udp_socket.close();
 		m_external_udp_port = 0;
@@ -2027,7 +2078,7 @@
 	template &lt;class Socket&gt;
 	void static set_socket_buffer_size(Socket&amp; s, session_settings const&amp; sett, error_code&amp; ec)
 	{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(39)">../src/session_impl.cpp:3288</a></td><td>have a separate list for these connections, instead of having to loop through all of them</td></tr><tr id="39" style="display: none;" colspan="3"><td colspan="3"><h2>have a separate list for these connections, instead of having to loop through all of them</h2><h4>../src/session_impl.cpp:3288</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// --------------------------------------------------------------
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(40)">../src/session_impl.cpp:3288</a></td><td>have a separate list for these connections, instead of having to loop through all of them</td></tr><tr id="40" style="display: none;" colspan="3"><td colspan="3"><h2>have a separate list for these connections, instead of having to loop through all of them</h2><h4>../src/session_impl.cpp:3288</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// --------------------------------------------------------------
 		if (!m_paused) m_auto_manage_time_scaler--;
 		if (m_auto_manage_time_scaler &lt; 0)
 		{
@@ -2078,7 +2129,7 @@
 
 		for (torrent_map::iterator i = m_torrents.begin();
 			i != m_torrents.end();)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(40)">../src/session_impl.cpp:4367</a></td><td>allow extensions to sort torrents for queuing</td></tr><tr id="40" style="display: none;" colspan="3"><td colspan="3"><h2>allow extensions to sort torrents for queuing</h2><h4>../src/session_impl.cpp:4367</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (t-&gt;is_auto_managed() &amp;&amp; !t-&gt;has_error())
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(41)">../src/session_impl.cpp:4372</a></td><td>allow extensions to sort torrents for queuing</td></tr><tr id="41" style="display: none;" colspan="3"><td colspan="3"><h2>allow extensions to sort torrents for queuing</h2><h4>../src/session_impl.cpp:4372</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (t-&gt;is_auto_managed() &amp;&amp; !t-&gt;has_error())
 			{
 				TORRENT_ASSERT(t-&gt;m_resume_data_loaded || !t-&gt;valid_metadata());
 				// this torrent is auto managed, add it to
@@ -2129,9 +2180,9 @@
 	void session_impl::recalculate_optimistic_unchoke_slots()
 	{
 		TORRENT_ASSERT(is_network_thread());
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(41)">../src/session_impl.cpp:4532</a></td><td>use a lower limit than m_settings.connections_limit to allocate the to 10% or so of connection slots for incoming connections</td></tr><tr id="41" style="display: none;" colspan="3"><td colspan="3"><h2>use a lower limit than m_settings.connections_limit
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(42)">../src/session_impl.cpp:4537</a></td><td>use a lower limit than m_settings.connections_limit to allocate the to 10% or so of connection slots for incoming connections</td></tr><tr id="42" style="display: none;" colspan="3"><td colspan="3"><h2>use a lower limit than m_settings.connections_limit
 to allocate the to 10% or so of connection slots for incoming
-connections</h2><h4>../src/session_impl.cpp:4532</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
+connections</h2><h4>../src/session_impl.cpp:4537</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
 			if (m_boost_connections &gt; max_connections)
 			{
 				m_boost_connections -= max_connections;
@@ -2182,8 +2233,8 @@
 					int num_attempts = 1;
 					if (!t.is_finished() &amp;&amp; m_num_active_downloading &gt; 0)
 					{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(42)">../src/session_impl.cpp:4566</a></td><td>make this bias configurable</td></tr><tr id="42" style="display: none;" colspan="3"><td colspan="3"><h2>make this bias configurable</h2><h4>../src/session_impl.cpp:4566</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;"></pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(43)">../src/session_impl.cpp:4567</a></td><td>also take average_peers into account, to create a bias for downloading torrents with < average peers</td></tr><tr id="43" style="display: none;" colspan="3"><td colspan="3"><h2>also take average_peers into account, to create a
-bias for downloading torrents with < average peers</h2><h4>../src/session_impl.cpp:4567</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">//				average_peers = num_downloads_peers / num_downloads;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(43)">../src/session_impl.cpp:4571</a></td><td>make this bias configurable</td></tr><tr id="43" style="display: none;" colspan="3"><td colspan="3"><h2>make this bias configurable</h2><h4>../src/session_impl.cpp:4571</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;"></pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(44)">../src/session_impl.cpp:4572</a></td><td>also take average_peers into account, to create a bias for downloading torrents with < average peers</td></tr><tr id="44" style="display: none;" colspan="3"><td colspan="3"><h2>also take average_peers into account, to create a
+bias for downloading torrents with < average peers</h2><h4>../src/session_impl.cpp:4572</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">//				average_peers = num_downloads_peers / num_downloads;
 
 			if (m_next_connect_torrent == m_torrents.end())
 				m_next_connect_torrent = m_torrents.begin();
@@ -2234,8 +2285,8 @@
 						if (num_connections() &gt;= m_settings.connections_limit) return;
 					}
 				}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(44)">../src/session_impl.cpp:4677</a></td><td>post a message to have this happen immediately instead of waiting for the next tick</td></tr><tr id="44" style="display: none;" colspan="3"><td colspan="3"><h2>post a message to have this happen
-immediately instead of waiting for the next tick</h2><h4>../src/session_impl.cpp:4677</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					{
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(45)">../src/session_impl.cpp:4682</a></td><td>post a message to have this happen immediately instead of waiting for the next tick</td></tr><tr id="45" style="display: none;" colspan="3"><td colspan="3"><h2>post a message to have this happen
+immediately instead of waiting for the next tick</h2><h4>../src/session_impl.cpp:4682</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					{
 						// we've unchoked this peer, and it hasn't reciprocated
 						// we may want to increase our estimated reciprocation rate
 						p-&gt;increase_est_reciprocation_rate();
@@ -2286,7 +2337,7 @@
 				prev = i;
 			}
 #endif
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(45)">../src/session_impl.cpp:4711</a></td><td>make configurable</td></tr><tr id="45" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/session_impl.cpp:4711</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(46)">../src/session_impl.cpp:4716</a></td><td>make configurable</td></tr><tr id="46" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/session_impl.cpp:4716</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 #ifdef TORRENT_DEBUG
 			for (std::vector&lt;peer_connection*&gt;::const_iterator i = peers.begin()
 				, end(peers.end()), prev(peers.end()); i != end; ++i)
@@ -2319,7 +2370,7 @@
 
 				++m_allowed_upload_slots;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(46)">../src/session_impl.cpp:4725</a></td><td>make configurable</td></tr><tr id="46" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/session_impl.cpp:4725</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">						&gt;= (*i)-&gt;uploaded_in_last_round() * 1000
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(47)">../src/session_impl.cpp:4730</a></td><td>make configurable</td></tr><tr id="47" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/session_impl.cpp:4730</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">						&gt;= (*i)-&gt;uploaded_in_last_round() * 1000
 						* (1 + t2-&gt;priority()) / total_milliseconds(unchoke_interval));
 				}
 				prev = i;
@@ -2370,7 +2421,7 @@
 			// if our current upload rate is less than 90% of our 
 			// limit AND most torrents are not "congested", i.e.
 			// they are not holding back because of a per-torrent
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(47)">../src/storage.cpp:322</a></td><td>if the read fails, set error and exit immediately</td></tr><tr id="47" style="display: none;" colspan="3"><td colspan="3"><h2>if the read fails, set error and exit immediately</h2><h4>../src/storage.cpp:322</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (m_storage-&gt;disk_pool()) block_size = m_storage-&gt;disk_pool()-&gt;block_size();
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(48)">../src/storage.cpp:322</a></td><td>if the read fails, set error and exit immediately</td></tr><tr id="48" style="display: none;" colspan="3"><td colspan="3"><h2>if the read fails, set error and exit immediately</h2><h4>../src/storage.cpp:322</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (m_storage-&gt;disk_pool()) block_size = m_storage-&gt;disk_pool()-&gt;block_size();
 			int size = slot_size;
 			int num_blocks = (size + block_size - 1) / block_size;
 
@@ -2421,7 +2472,7 @@
 				{
 					buf.iov_len = (std::min)(block_size, size);
 					// deliberately pass in 0 as flags, to disable random_access
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(48)">../src/storage.cpp:356</a></td><td>if the read fails, set error and exit immediately</td></tr><tr id="48" style="display: none;" colspan="3"><td colspan="3"><h2>if the read fails, set error and exit immediately</h2><h4>../src/storage.cpp:356</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					{
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(49)">../src/storage.cpp:356</a></td><td>if the read fails, set error and exit immediately</td></tr><tr id="49" style="display: none;" colspan="3"><td colspan="3"><h2>if the read fails, set error and exit immediately</h2><h4>../src/storage.cpp:356</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					{
 						ph.h.update((char const*)bufs[i].iov_base, bufs[i].iov_len);
 						small_piece_size -= bufs[i].iov_len;
 					}
@@ -2472,7 +2523,7 @@
 		, m_file_priority(file_prio)
 		, m_pool(fp)
 		, m_page_size(page_size())
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(49)">../src/storage.cpp:645</a></td><td>make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance maybe use the same format as .torrent files and reuse some code from torrent_info</td></tr><tr id="49" style="display: none;" colspan="3"><td colspan="3"><h2>make this more generic to not just work if files have been
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(50)">../src/storage.cpp:645</a></td><td>make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance maybe use the same format as .torrent files and reuse some code from torrent_info</td></tr><tr id="50" style="display: none;" colspan="3"><td colspan="3"><h2>make this more generic to not just work if files have been
 renamed, but also if they have been merged into a single file for instance
 maybe use the same format as .torrent files and reuse some code from torrent_info</h2><h4>../src/storage.cpp:645</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		for (;;)
 		{
@@ -2525,7 +2576,7 @@
 		
 		for (int i = 0; i &lt; file_sizes_ent-&gt;list_size(); ++i)
 		{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(50)">../src/storage.cpp:1280</a></td><td>what if file_base is used to merge several virtual files into a single physical file? We should probably disable this if file_base is used. This is not a widely used feature though</td></tr><tr id="50" style="display: none;" colspan="3"><td colspan="3"><h2>what if file_base is used to merge several virtual files
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(51)">../src/storage.cpp:1280</a></td><td>what if file_base is used to merge several virtual files into a single physical file? We should probably disable this if file_base is used. This is not a widely used feature though</td></tr><tr id="51" style="display: none;" colspan="3"><td colspan="3"><h2>what if file_base is used to merge several virtual files
 into a single physical file? We should probably disable this
 if file_base is used. This is not a widely used feature though</h2><h4>../src/storage.cpp:1280</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			int bytes_transferred = 0;
 			// if the file is opened in no_buffer mode, and the
@@ -2578,12 +2629,12 @@
 	// makes unaligned requests (and the disk cache is disabled or fully utilized
 	// for write cache).
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(51)">../src/torrent.cpp:1271</a></td><td>is verify_peer_cert called once per certificate in the chain, and this function just tells us which depth we're at right now? If so, the comment makes sense. any certificate that isn't the leaf (i.e. the one presented by the peer) should be accepted automatically, given preverified is true. The leaf certificate need to be verified to make sure its DN matches the info-hash</td></tr><tr id="51" style="display: none;" colspan="3"><td colspan="3"><h2>is verify_peer_cert called once per certificate in the chain, and
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(52)">../src/torrent.cpp:1275</a></td><td>is verify_peer_cert called once per certificate in the chain, and this function just tells us which depth we're at right now? If so, the comment makes sense. any certificate that isn't the leaf (i.e. the one presented by the peer) should be accepted automatically, given preverified is true. The leaf certificate need to be verified to make sure its DN matches the info-hash</td></tr><tr id="52" style="display: none;" colspan="3"><td colspan="3"><h2>is verify_peer_cert called once per certificate in the chain, and
 this function just tells us which depth we're at right now? If so, the comment
 makes sense.
 any certificate that isn't the leaf (i.e. the one presented by the peer)
 should be accepted automatically, given preverified is true. The leaf certificate
-need to be verified to make sure its DN matches the info-hash</h2><h4>../src/torrent.cpp:1271</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (pp) p-&gt;add_extension(pp);
+need to be verified to make sure its DN matches the info-hash</h2><h4>../src/torrent.cpp:1275</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (pp) p-&gt;add_extension(pp);
 		}
 
 		// if files are checked for this torrent, call the extension
@@ -2634,12 +2685,12 @@
 			{
 #if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
 				match = true;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(52)">../src/torrent.cpp:5331</a></td><td>make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance maybe use the same format as .torrent files and reuse some code from torrent_info The mapped_files needs to be read both in the network thread and in the disk thread, since they both have their own mapped files structures which are kept in sync</td></tr><tr id="52" style="display: none;" colspan="3"><td colspan="3"><h2>make this more generic to not just work if files have been
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(53)">../src/torrent.cpp:5365</a></td><td>make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance maybe use the same format as .torrent files and reuse some code from torrent_info The mapped_files needs to be read both in the network thread and in the disk thread, since they both have their own mapped files structures which are kept in sync</td></tr><tr id="53" style="display: none;" colspan="3"><td colspan="3"><h2>make this more generic to not just work if files have been
 renamed, but also if they have been merged into a single file for instance
 maybe use the same format as .torrent files and reuse some code from torrent_info
 The mapped_files needs to be read both in the network thread
 and in the disk thread, since they both have their own mapped files structures
-which are kept in sync</h2><h4>../src/torrent.cpp:5331</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				m_save_path = p;
+which are kept in sync</h2><h4>../src/torrent.cpp:5365</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				m_save_path = p;
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 				debug_log("loaded resume data: save-path: %s", m_save_path.c_str());
 #endif
@@ -2669,33 +2720,33 @@
 				m_torrent_file-&gt;rename_file(i, new_filename);
 			}
 		}
-		
+
 		m_added_time = rd.dict_find_int_value("added_time", m_added_time);
 		m_completed_time = rd.dict_find_int_value("completed_time", m_completed_time);
 		if (m_completed_time != 0 &amp;&amp; m_completed_time &lt; m_added_time)
 			m_completed_time = m_added_time;
 
-		if (!m_seed_mode &amp;&amp; !m_override_resume_data)
+		if (!m_override_resume_data)
 		{
 			lazy_entry const* file_priority = rd.dict_find_list("file_priority");
-			if (file_priority &amp;&amp; file_priority-&gt;list_size()
-				== m_torrent_file-&gt;num_files())
+			if (file_priority)
 			{
-				for (int i = 0; i &lt; file_priority-&gt;list_size(); ++i)
+				const int num_files = (std::min)(file_priority-&gt;list_size()
+					, m_torrent_file-&gt;num_files());
+				for (int i = 0; i &lt; num_files; ++i)
+				{
 					m_file_priority[i] = file_priority-&gt;list_int_value_at(i, 1);
+					// this is suspicious, leave seed mode
+					if (m_file_priority[i] == 0) m_seed_mode = false;
+				}
 				update_piece_priorities();
 			}
-		}
-
-		lazy_entry const* trackers = rd.dict_find_list("trackers");
-		if (trackers)
-		{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(53)">../src/torrent.cpp:5433</a></td><td>if this is a merkle torrent and we can't restore the tree, we need to wipe all the bits in the have array, but not necessarily we might want to do a full check to see if we have all the pieces. This is low priority since almost no one uses merkle torrents</td></tr><tr id="53" style="display: none;" colspan="3"><td colspan="3"><h2>if this is a merkle torrent and we can't
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(54)">../src/torrent.cpp:5481</a></td><td>if this is a merkle torrent and we can't restore the tree, we need to wipe all the bits in the have array, but not necessarily we might want to do a full check to see if we have all the pieces. This is low priority since almost no one uses merkle torrents</td></tr><tr id="54" style="display: none;" colspan="3"><td colspan="3"><h2>if this is a merkle torrent and we can't
 restore the tree, we need to wipe all the
 bits in the have array, but not necessarily
 we might want to do a full check to see if we have
 all the pieces. This is low priority since almost
-no one uses merkle torrents</h2><h4>../src/torrent.cpp:5433</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				add_web_seed(url, web_seed_entry::http_seed);
+no one uses merkle torrents</h2><h4>../src/torrent.cpp:5481</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				add_web_seed(url, web_seed_entry::http_seed);
 			}
 		}
 
@@ -2718,37 +2769,37 @@
 <div style="background: #ffff00" width="100%">				TORRENT_ASSERT(false);
 </div>			}
 		}
-	}
-
-	boost::intrusive_ptr&lt;torrent_info const&gt; torrent::get_torrent_copy()
-	{
-		if (!m_torrent_file-&gt;is_valid()) return boost::intrusive_ptr&lt;torrent_info&gt;();
-
-		// copy the torrent_info object
-		return boost::intrusive_ptr&lt;torrent_info&gt;(new torrent_info(*m_torrent_file));
-	}
-
-	void torrent::write_resume_data(entry&amp; ret) const
-	{
-		using namespace libtorrent::detail; // for write_*_endpoint()
-		ret["file-format"] = "libtorrent resume file";
-		ret["file-version"] = 1;
-		ret["libtorrent-version"] = LIBTORRENT_VERSION;
-
-		ret["total_uploaded"] = m_total_uploaded;
-		ret["total_downloaded"] = m_total_downloaded;
 
-		ret["active_time"] = m_active_time;
-		ret["finished_time"] = m_finished_time;
-		ret["seeding_time"] = m_seeding_time;
-		ret["last_seen_complete"] = m_last_seen_complete;
+		if (m_seed_mode)
+		{
+			// some sanity checking. Maybe we shouldn't be in seed mode anymore
+			lazy_entry const* pieces = rd.dict_find("pieces");
+			if (pieces &amp;&amp; pieces-&gt;type() == lazy_entry::string_t
+				&amp;&amp; int(pieces-&gt;string_length()) == m_torrent_file-&gt;num_pieces())
+			{
+				char const* pieces_str = pieces-&gt;string_ptr();
+				for (int i = 0, end(pieces-&gt;string_length()); i &lt; end; ++i)
+				{
+					// being in seed mode and missing a piece is not compatible.
+					// Leave seed mode if that happens
+					if ((pieces_str[i] &amp; 1)) continue;
+					m_seed_mode = false;
+					break;
+				}
+			}
 
-		ret["num_complete"] = m_complete;
-		ret["num_incomplete"] = m_incomplete;
-		ret["num_downloaded"] = m_downloaded;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(54)">../src/torrent.cpp:5620</a></td><td>make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance. using file_base</td></tr><tr id="54" style="display: none;" colspan="3"><td colspan="3"><h2>make this more generic to not just work if files have been
+			lazy_entry const* piece_priority = m_resume_entry.dict_find_string("piece_priority");
+			if (piece_priority &amp;&amp; piece_priority-&gt;string_length()
+				== m_torrent_file-&gt;num_pieces())
+			{
+				char const* p = piece_priority-&gt;string_ptr();
+				for (int i = 0; i &lt; piece_priority-&gt;string_length(); ++i)
+				{
+					if (p[i] &gt; 0) continue;
+					m_seed_mode = false;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(55)">../src/torrent.cpp:5702</a></td><td>make this more generic to not just work if files have been renamed, but also if they have been merged into a single file for instance. using file_base</td></tr><tr id="55" style="display: none;" colspan="3"><td colspan="3"><h2>make this more generic to not just work if files have been
 renamed, but also if they have been merged into a single file for instance.
-using file_base</h2><h4>../src/torrent.cpp:5620</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		entry::string_type&amp; pieces = ret["pieces"].string();
+using file_base</h2><h4>../src/torrent.cpp:5702</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		entry::string_type&amp; pieces = ret["pieces"].string();
 		pieces.resize(m_torrent_file-&gt;num_pieces());
 		if (is_seed())
 		{
@@ -2799,10 +2850,10 @@
 			error_code ec;
 			policy::peer const* p = *i;
 			address addr = p-&gt;address();
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(55)">../src/torrent.cpp:8296</a></td><td>go through the pieces we have and count the total number of downloaders we have. Only count peers that are interested in us since some peers might not send have messages for pieces we have it num_interested == 0, we need to pick a new piece</td></tr><tr id="55" style="display: none;" colspan="3"><td colspan="3"><h2>go through the pieces we have and count the total number
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(56)">../src/torrent.cpp:8400</a></td><td>go through the pieces we have and count the total number of downloaders we have. Only count peers that are interested in us since some peers might not send have messages for pieces we have it num_interested == 0, we need to pick a new piece</td></tr><tr id="56" style="display: none;" colspan="3"><td colspan="3"><h2>go through the pieces we have and count the total number
 of downloaders we have. Only count peers that are interested in us
 since some peers might not send have messages for pieces we have
-it num_interested == 0, we need to pick a new piece</h2><h4>../src/torrent.cpp:8296</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			}
+it num_interested == 0, we need to pick a new piece</h2><h4>../src/torrent.cpp:8400</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			}
 
 			rarest_pieces.clear();
 			rarest_rarity = pp.peer_count;
@@ -2853,8 +2904,8 @@
 		{
 			m_picker-&gt;get_availability(avail_vec);
 		}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(56)">../src/torrent.cpp:8945</a></td><td>instead of resorting the whole list, insert the peers directly into the right place</td></tr><tr id="56" style="display: none;" colspan="3"><td colspan="3"><h2>instead of resorting the whole list, insert the peers
-directly into the right place</h2><h4>../src/torrent.cpp:8945</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				printf("timed out [average-piece-time: %d ms ]\n"
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(57)">../src/torrent.cpp:9049</a></td><td>instead of resorting the whole list, insert the peers directly into the right place</td></tr><tr id="57" style="display: none;" colspan="3"><td colspan="3"><h2>instead of resorting the whole list, insert the peers
+directly into the right place</h2><h4>../src/torrent.cpp:9049</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				printf("timed out [average-piece-time: %d ms ]\n"
 					, m_average_piece_time);
 #endif
 			}
@@ -2905,7 +2956,7 @@
 			ret.insert(i-&gt;url);
 		}
 		return ret;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(57)">../src/udp_socket.cpp:292</a></td><td>it would be nice to detect this on posix systems also</td></tr><tr id="57" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to detect this on posix systems also</h2><h4>../src/udp_socket.cpp:292</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		--m_v6_outstanding;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(58)">../src/udp_socket.cpp:292</a></td><td>it would be nice to detect this on posix systems also</td></tr><tr id="58" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to detect this on posix systems also</h2><h4>../src/udp_socket.cpp:292</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		--m_v6_outstanding;
 	}
 	else
 #endif
@@ -2956,7 +3007,7 @@
 			ret = (*i)-&gt;incoming_packet(ec, ep, buf, size);
 		} TORRENT_CATCH (std::exception&amp;) {}
 		if (*i == NULL) i = m_observers.erase(i);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(58)">../src/udp_tracker_connection.cpp:553</a></td><td>it would be more efficient to not use a string here. however, the problem is that some trackers will respond with actual strings. For example i2p trackers</td></tr><tr id="58" style="display: none;" colspan="3"><td colspan="3"><h2>it would be more efficient to not use a string here.
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(59)">../src/udp_tracker_connection.cpp:553</a></td><td>it would be more efficient to not use a string here. however, the problem is that some trackers will respond with actual strings. For example i2p trackers</td></tr><tr id="59" style="display: none;" colspan="3"><td colspan="3"><h2>it would be more efficient to not use a string here.
 however, the problem is that some trackers will respond
 with actual strings. For example i2p trackers</h2><h4>../src/udp_tracker_connection.cpp:553</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		}
 
@@ -3009,7 +3060,7 @@
 	{
 		restart_read_timeout();
 		int action = detail::read_int32(buf);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(59)">../src/upnp.cpp:72</a></td><td>listen_interface is not used. It's meant to bind the broadcast socket</td></tr><tr id="59" style="display: none;" colspan="3"><td colspan="3"><h2>listen_interface is not used. It's meant to bind the broadcast socket</h2><h4>../src/upnp.cpp:72</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include &lt;asio/ip/multicast.hpp&gt;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(60)">../src/upnp.cpp:72</a></td><td>listen_interface is not used. It's meant to bind the broadcast socket</td></tr><tr id="60" style="display: none;" colspan="3"><td colspan="3"><h2>listen_interface is not used. It's meant to bind the broadcast socket</h2><h4>../src/upnp.cpp:72</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include &lt;asio/ip/multicast.hpp&gt;
 #else
 #include &lt;boost/asio/ip/host_name.hpp&gt;
 #include &lt;boost/asio/ip/multicast.hpp&gt;
@@ -3060,9 +3111,7 @@
 		m_mappings.swap(s-&gt;mappings);
 		delete s;
 	}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(60)">../src/utp_stream.cpp:1613</a></td><td>this loop may not be very efficient</td></tr><tr id="60" style="display: none;" colspan="3"><td colspan="3"><h2>this loop may not be very efficient</h2><h4>../src/utp_stream.cpp:1613</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
-	char* m_buf;
-};
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(61)">../src/utp_stream.cpp:1621</a></td><td>this loop may not be very efficient</td></tr><tr id="61" style="display: none;" colspan="3"><td colspan="3"><h2>this loop may not be very efficient</h2><h4>../src/utp_stream.cpp:1621</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">};
 
 // sends a packet, pulls data from the write buffer (if there's any)
 // if ack is true, we need to send a packet regardless of if there's
@@ -3072,7 +3121,9 @@
 // congestion window, false if there is no more space.
 bool utp_socket_impl::send_pkt(int flags)
 {
+#ifdef TORRENT_EXPENSIVE_INVARIANT_CHECKS
 	INVARIANT_CHECK;
+#endif
 
 	bool force = (flags &amp; pkt_ack) || (flags &amp; pkt_fin);
 
@@ -3111,7 +3162,7 @@
 		if (sack &gt; 32) sack = 32;
 	}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(61)">../src/kademlia/dht_tracker.cpp:433</a></td><td>ideally this function would be called when the put completes</td></tr><tr id="61" style="display: none;" colspan="3"><td colspan="3"><h2>ideally this function would be called when the
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(62)">../src/kademlia/dht_tracker.cpp:433</a></td><td>ideally this function would be called when the put completes</td></tr><tr id="62" style="display: none;" colspan="3"><td colspan="3"><h2>ideally this function would be called when the
 put completes</h2><h4>../src/kademlia/dht_tracker.cpp:433</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// since it controls whether we re-put the content
 		TORRENT_ASSERT(!it.is_mutable());
 		f(it);
@@ -3163,7 +3214,7 @@
 		std::string flat_data;
 		bencode(std::back_inserter(flat_data), data);
 		sha1_hash target = item_target_id(
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(62)">../include/libtorrent/config.hpp:286</a></td><td>Make this count Unicode characters instead of bytes on windows</td></tr><tr id="62" style="display: none;" colspan="3"><td colspan="3"><h2>Make this count Unicode characters instead of bytes on windows</h2><h4>../include/libtorrent/config.hpp:286</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#define TORRENT_USE_SYSCTL 1
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(63)">../include/libtorrent/config.hpp:294</a></td><td>Make this count Unicode characters instead of bytes on windows</td></tr><tr id="63" style="display: none;" colspan="3"><td colspan="3"><h2>Make this count Unicode characters instead of bytes on windows</h2><h4>../include/libtorrent/config.hpp:294</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#define TORRENT_USE_SYSCTL 1
 #define TORRENT_USE_MLOCK 0
 #define TORRENT_USE_IPV6 0
 #define TORRENT_ICONV_ARG (const char**)
@@ -3214,7 +3265,7 @@
 
 #endif
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(63)">../include/libtorrent/peer_connection.hpp:723</a></td><td>make this private</td></tr><tr id="63" style="display: none;" colspan="3"><td colspan="3"><h2>make this private</h2><h4>../include/libtorrent/peer_connection.hpp:723</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		void set_soft_packet_size(int size) { m_soft_packet_size = size; }
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(64)">../include/libtorrent/peer_connection.hpp:723</a></td><td>make this private</td></tr><tr id="64" style="display: none;" colspan="3"><td colspan="3"><h2>make this private</h2><h4>../include/libtorrent/peer_connection.hpp:723</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		void set_soft_packet_size(int size) { m_soft_packet_size = size; }
 
 		// if allow_encrypted is false, and the torrent 'ih' turns out
 		// to be an encrypted torrent (AES-256 encrypted) the peer will
@@ -3265,13 +3316,7 @@
 		// we have choked the upload to the peer
 		bool m_choked:1;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(64)">../include/libtorrent/peer_connection.hpp:804</a></td><td>make these private as well</td></tr><tr id="64" style="display: none;" colspan="3"><td colspan="3"><h2>make these private as well</h2><h4>../include/libtorrent/peer_connection.hpp:804</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
-		// when this is set, the peer_connection socket is
-		// corked, similar to the linux TCP feature TCP_CORK.
-		// we won't send anything to the actual socket, just
-		// buffer messages up in the application layer send
-		// buffer, and send it once we're uncorked.
-		bool m_corked:1;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(65)">../include/libtorrent/peer_connection.hpp:810</a></td><td>make these private as well</td></tr><tr id="65" style="display: none;" colspan="3"><td colspan="3"><h2>make these private as well</h2><h4>../include/libtorrent/peer_connection.hpp:810</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		bool m_corked:1;
 
 		// set to true if this peer has metadata, and false
 		// otherwise.
@@ -3285,6 +3330,12 @@
 		// other peers to compare it to.
 		bool m_exceeded_limit:1;
 
+		// this is slow-start at the bittorrent layer. It affects how we increase
+		// desired queue size (i.e. the number of outstanding requests we keep).
+		// While the underlying transport protocol is in slow-start, the number of
+		// outstanding requests need to increase at the same pace to keep up.
+		bool m_slow_start:1;
+
 <div style="background: #ffff00" width="100%">	protected:
 </div>
 		// number of bytes this peer can send and receive
@@ -3316,7 +3367,7 @@
 		sliding_average&lt;20&gt; m_send_rate;
 
 	private:
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(65)">../include/libtorrent/proxy_base.hpp:166</a></td><td>it would be nice to remember the bind port and bind once we know where the proxy is m_sock.bind(endpoint, ec);</td></tr><tr id="65" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to remember the bind port and bind once we know where the proxy is
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(66)">../include/libtorrent/proxy_base.hpp:166</a></td><td>it would be nice to remember the bind port and bind once we know where the proxy is m_sock.bind(endpoint, ec);</td></tr><tr id="66" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to remember the bind port and bind once we know where the proxy is
 m_sock.bind(endpoint, ec);</h2><h4>../include/libtorrent/proxy_base.hpp:166</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
 		return m_sock.get_option(opt, ec);
 	}
@@ -3368,7 +3419,7 @@
 		m_sock.close(ec);
 		m_resolver.cancel();
 	}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(66)">../include/libtorrent/stat.hpp:113</a></td><td>this is 4 bytes of padding!</td></tr><tr id="66" style="display: none;" colspan="3"><td colspan="3"><h2>this is 4 bytes of padding!</h2><h4>../include/libtorrent/stat.hpp:113</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(67)">../include/libtorrent/stat.hpp:113</a></td><td>this is 4 bytes of padding!</td></tr><tr id="67" style="display: none;" colspan="3"><td colspan="3"><h2>this is 4 bytes of padding!</h2><h4>../include/libtorrent/stat.hpp:113</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		int counter() const { return m_counter; }
 
 		void clear()
@@ -3419,7 +3470,7 @@
 #endif
 		}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(67)">../include/libtorrent/torrent_info.hpp:123</a></td><td>include the number of peers received from this tracker, at last announce</td></tr><tr id="67" style="display: none;" colspan="3"><td colspan="3"><h2>include the number of peers received from this tracker, at last announce</h2><h4>../include/libtorrent/torrent_info.hpp:123</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(68)">../include/libtorrent/torrent_info.hpp:123</a></td><td>include the number of peers received from this tracker, at last announce</td></tr><tr id="68" style="display: none;" colspan="3"><td colspan="3"><h2>include the number of peers received from this tracker, at last announce</h2><h4>../include/libtorrent/torrent_info.hpp:123</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// if this tracker failed the last time it was contacted
 		// this error code specifies what error occurred
 		error_code last_error;
@@ -3470,7 +3521,7 @@
 		// flags for the source bitmask, each indicating where
 		// we heard about this tracker
 		enum tracker_source
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(68)">../include/libtorrent/upnp.hpp:112</a></td><td>support using the windows API for UPnP operations as well</td></tr><tr id="68" style="display: none;" colspan="3"><td colspan="3"><h2>support using the windows API for UPnP operations as well</h2><h4>../include/libtorrent/upnp.hpp:112</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			external_port_must_be_wildcard = 727
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(69)">../include/libtorrent/upnp.hpp:112</a></td><td>support using the windows API for UPnP operations as well</td></tr><tr id="69" style="display: none;" colspan="3"><td colspan="3"><h2>support using the windows API for UPnP operations as well</h2><h4>../include/libtorrent/upnp.hpp:112</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			external_port_must_be_wildcard = 727
 		};
 
 		// hidden
@@ -3521,7 +3572,7 @@
 	// is -1, which means failure. There will not be any error alert notification for
 	// mappings that fail with a -1 return value.
 	int add_mapping(protocol_type p, int external_port, int local_port);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(69)">../include/libtorrent/utp_stream.hpp:378</a></td><td>implement blocking write. Low priority since it's not used (yet)</td></tr><tr id="69" style="display: none;" colspan="3"><td colspan="3"><h2>implement blocking write. Low priority since it's not used (yet)</h2><h4>../include/libtorrent/utp_stream.hpp:378</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		for (typename Mutable_Buffers::const_iterator i = buffers.begin()
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(70)">../include/libtorrent/utp_stream.hpp:378</a></td><td>implement blocking write. Low priority since it's not used (yet)</td></tr><tr id="70" style="display: none;" colspan="3"><td colspan="3"><h2>implement blocking write. Low priority since it's not used (yet)</h2><h4>../include/libtorrent/utp_stream.hpp:378</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		for (typename Mutable_Buffers::const_iterator i = buffers.begin()
 			, end(buffers.end()); i != end; ++i)
 		{
 			using asio::buffer_cast;
@@ -3572,7 +3623,7 @@
 		TORRENT_ASSERT(false);
 	}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(70)">../include/libtorrent/kademlia/item.hpp:61</a></td><td>since this is a public function, it should probably be moved out of this header and into one with other public functions.</td></tr><tr id="70" style="display: none;" colspan="3"><td colspan="3"><h2>since this is a public function, it should probably be moved
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(71)">../include/libtorrent/kademlia/item.hpp:61</a></td><td>since this is a public function, it should probably be moved out of this header and into one with other public functions.</td></tr><tr id="71" style="display: none;" colspan="3"><td colspan="3"><h2>since this is a public function, it should probably be moved
 out of this header and into one with other public functions.</h2><h4>../include/libtorrent/kademlia/item.hpp:61</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include &lt;boost/array.hpp&gt;
 
 namespace libtorrent { namespace dht
diff -Nru libtorrent-rasterbar-1.0.6/docs/troubleshooting.html libtorrent-rasterbar-1.0.7/docs/troubleshooting.html
--- libtorrent-rasterbar-1.0.6/docs/troubleshooting.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/troubleshooting.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <p>The following troubleshooting chart may help in finding out why torrents fail
diff -Nru libtorrent-rasterbar-1.0.6/docs/troubleshooting.rst libtorrent-rasterbar-1.0.7/docs/troubleshooting.rst
--- libtorrent-rasterbar-1.0.6/docs/troubleshooting.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/troubleshooting.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/tuning.html libtorrent-rasterbar-1.0.7/docs/tuning.html
--- libtorrent-rasterbar-1.0.6/docs/tuning.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/tuning.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/tuning.rst libtorrent-rasterbar-1.0.7/docs/tuning.rst
--- libtorrent-rasterbar-1.0.6/docs/tuning.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/tuning.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
diff -Nru libtorrent-rasterbar-1.0.6/docs/utp.html libtorrent-rasterbar-1.0.7/docs/utp.html
--- libtorrent-rasterbar-1.0.6/docs/utp.html	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/utp.html	2015-11-14 05:21:45.000000000 +0000
@@ -42,7 +42,7 @@
 <tr><th class="docinfo-name">Author:</th>
 <td>Arvid Norberg, <a class="last reference external" href="mailto:arvid&#64;libtorrent.org">arvid&#64;libtorrent.org</a></td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.0.5</td></tr>
+<td>1.0.7</td></tr>
 </tbody>
 </table>
 <div class="contents topic" id="table-of-contents">
diff -Nru libtorrent-rasterbar-1.0.6/docs/utp.rst libtorrent-rasterbar-1.0.7/docs/utp.rst
--- libtorrent-rasterbar-1.0.6/docs/utp.rst	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/docs/utp.rst	2015-11-14 05:22:43.000000000 +0000
@@ -3,7 +3,7 @@
 =================
 
 :Author: Arvid Norberg, arvid@libtorrent.org
-:Version: 1.0.6
+:Version: 1.0.7
 
 .. contents:: Table of contents
   :depth: 2
Binary files /tmp/WBQ_OzDV3P/libtorrent-rasterbar-1.0.6/docs/._utp_stack.png and /tmp/PY6ChjGgAt/libtorrent-rasterbar-1.0.7/docs/._utp_stack.png differ
Binary files /tmp/WBQ_OzDV3P/libtorrent-rasterbar-1.0.6/docs/utp_stack.png and /tmp/PY6ChjGgAt/libtorrent-rasterbar-1.0.7/docs/utp_stack.png differ
diff -Nru libtorrent-rasterbar-1.0.6/examples/client_test.cpp libtorrent-rasterbar-1.0.7/examples/client_test.cpp
--- libtorrent-rasterbar-1.0.6/examples/client_test.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/examples/client_test.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -1171,7 +1171,7 @@
 			if (!peer.empty())
 			{
 				char* port = (char*) strrchr((char*)peer.c_str(), ':');
-				if (port > 0)
+				if (port != NULL)
 				{
 					*port++ = 0;
 					char const* ip = peer.c_str();
@@ -1870,7 +1870,7 @@
 				{
 					char url[4096];
 					puts("Enter magnet link:\n");
-					scanf("%4096s", url);
+					scanf("%4095s", url);
 
 					add_torrent_params p;
 					if (seed_mode) p.flags |= add_torrent_params::flag_seed_mode;
@@ -2028,7 +2028,7 @@
 				{
 					char url[2048];
 					puts("Enter RSS feed URL:\n");
-					scanf("%2048s", url);
+					scanf("%2047s", url);
 					feed_settings set;
 					set.url = url;
 					set.add_args.save_path = save_path;
diff -Nru libtorrent-rasterbar-1.0.6/examples/Makefile.in libtorrent-rasterbar-1.0.7/examples/Makefile.in
--- libtorrent-rasterbar-1.0.6/examples/Makefile.in	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/examples/Makefile.in	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -82,8 +92,6 @@
 @ENABLE_EXAMPLES_TRUE@bin_PROGRAMS = $(am__EXEEXT_1)
 EXTRA_PROGRAMS = $(am__EXEEXT_1)
 subdir = examples
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
 	$(top_srcdir)/m4/ax_boost_python.m4 \
@@ -99,6 +107,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -211,6 +220,8 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -267,6 +278,7 @@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -412,7 +424,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign examples/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -754,6 +765,8 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
 
+.PRECIOUS: Makefile
+
 #AM_LDFLAGS = $(LDFLAGS) @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
 #AM_LDFLAGS = @OPENSSL_LDFLAGS@
 
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/add_torrent_params.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/add_torrent_params.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/add_torrent_params.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/add_torrent_params.hpp	2015-11-14 05:21:45.000000000 +0000
@@ -227,7 +227,11 @@
 
 			// defaults to off and specifies whether tracker URLs loaded from
 			// resume data should be added to the trackers in the torrent or
-			// replace the trackers.
+			// replace the trackers. When replacing trackers (i.e. this flag is not
+			// set), any trackers passed in via add_torrent_params are also
+			// replaced by any trackers in the resume data. The default behavior is
+			// to have the resume data override the .torrent file _and_ the
+			// trackers added in add_torrent_params.
 			flag_merge_resume_trackers = 0x100,
 
 			// on by default and means that this torrent will be part of state
@@ -250,6 +254,16 @@
 			// case the save_path specified in add_torrent_params is always used.
 			flag_use_resume_save_path = 0x1000,
 
+			// defaults to off and specifies whether web seed URLs loaded from
+			// resume data should be added to the ones in the torrent file or
+			// replace them. No distinction is made between the two different kinds
+			// of web seeds (`BEP 17`_ and `BEP 19`_). When replacing web seeds
+			// (i.e. when this flag is not set), any web seeds passed in via
+			// add_torrent_params are also replaced. The default behavior is to
+			// have any web seeds in the resume data take presedence over whatever
+			// is passed in here as well as the .torrent file.
+			flag_merge_resume_http_seeds = 0x2000,
+
 			// internal
 			default_flags = flag_update_subscribe | flag_auto_managed | flag_paused | flag_apply_ip_filter
 #ifndef TORRENT_NO_DEPRECATE
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/config.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/config.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/config.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/config.hpp	2015-11-14 05:21:45.000000000 +0000
@@ -193,6 +193,14 @@
 #else
 #define TORRENT_USE_IFADDRS 1
 #define TORRENT_USE_POSIX_MEMALIGN 1
+
+// posix_fallocate() is available under this condition
+#if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
+#define TORRENT_HAS_FALLOCATE 1
+#else
+#define TORRENT_HAS_FALLOCATE 0
+#endif
+
 #endif
 
 #if __amd64__ || __i386__
@@ -315,7 +323,7 @@
 
 #endif
 
-#if defined TORRENT_WINDOWS && !defined TORRENT_MINGW
+#if (defined _MSC_VER && _MSC_VER < 1900) && !defined TORRENT_MINGW
 
 #include <stdarg.h>
 
@@ -337,8 +345,6 @@
 }
 
 #define strtoll _strtoi64
-#else
-#include <limits.h>
 #endif
 
 #if (defined(TORRENT_LOGGING) || defined(TORRENT_VERBOSE_LOGGING)) \
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/create_torrent.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/create_torrent.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/create_torrent.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/create_torrent.hpp	2015-11-14 05:21:39.000000000 +0000
@@ -123,7 +123,7 @@
 			// not grow with more pieces. When this option is specified, it is
 			// recommended to have a fairly small piece size, say 64 kiB.
 			// When creating merkle torrents, the full hash tree is also generated
-			// and should be saved off separately. It is accessed through the 
+			// and should be saved off separately. It is accessed through the
 			// create_torrent::merkle_tree() function.
 			, merkle = 2
 
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/Makefile.in libtorrent-rasterbar-1.0.7/include/libtorrent/Makefile.in
--- libtorrent-rasterbar-1.0.6/include/libtorrent/Makefile.in	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/Makefile.in	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -80,8 +90,6 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include/libtorrent
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(am__nobase_include_HEADERS_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
 	$(top_srcdir)/m4/ax_boost_python.m4 \
@@ -97,6 +105,8 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_include_HEADERS_DIST) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -213,6 +223,7 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -269,6 +280,7 @@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -536,7 +548,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/libtorrent/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign include/libtorrent/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -786,6 +797,8 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-nobase_includeHEADERS
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/piece_picker.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/piece_picker.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/piece_picker.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/piece_picker.hpp	2015-11-14 05:21:45.000000000 +0000
@@ -71,15 +71,13 @@
 		const static piece_block invalid;
 
 		piece_block() {}
-		piece_block(boost::uint32_t p_index, boost::uint16_t b_index)
+		piece_block(int p_index, int b_index)
 			: piece_index(p_index)
 			, block_index(b_index)
 		{
-			TORRENT_ASSERT(p_index < (1 << 19));
-			TORRENT_ASSERT(b_index < (1 << 13));
 		}
-		boost::uint32_t piece_index:19;
-		boost::uint32_t block_index:13;
+		int piece_index;
+		int block_index;
 
 		bool operator<(piece_block const& b) const
 		{
@@ -643,8 +641,7 @@
 #if TORRENT_COMPACT_PICKER
 		enum { max_pieces = piece_pos::we_have_index - 1 };
 #else
-		// still limited by piece_block
-		enum { max_pieces = (1 << 19) - 2 };
+		enum { max_pieces = INT_MAX - 1 };
 #endif
 
 	};
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/session.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/session.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/session.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/session.hpp	2015-11-14 05:21:45.000000000 +0000
@@ -196,7 +196,7 @@
 		{
 			TORRENT_CFG();
 			TORRENT_ASSERT(listen_port_range.first > 0);
-			TORRENT_ASSERT(listen_port_range.first < listen_port_range.second);
+			TORRENT_ASSERT(listen_port_range.first <= listen_port_range.second);
 			init(listen_port_range, listen_interface, print, alert_mask);
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
 			set_log_path(logpath);
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/session_settings.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/session_settings.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/session_settings.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/session_settings.hpp	2015-11-14 05:21:45.000000000 +0000
@@ -514,7 +514,9 @@
 		// blocks that are allocated at a time when the pool needs to grow can be
 		// specified in ``cache_buffer_chunk_size``. This defaults to 16 blocks.
 		// Lower numbers saves memory at the expense of more heap allocations. It
-		// must be at least 1.
+		// must be at least 1. When built in 32 bit mode, the effective cache size
+		// will be capped at 3/4 of 2 GiB. This is to avoid exceeding the virtual
+		// address space limitations.
 		int cache_size;
 
 		// this is the number of disk buffer blocks (16 kiB) that should be
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/torrent.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/torrent.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/torrent.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/torrent.hpp	2015-11-14 05:21:45.000000000 +0000
@@ -740,7 +740,10 @@
 		}
 
 		bool is_inactive() const
-		{ return m_inactive; }
+		{
+			if (!settings().dont_count_slow_torrents) return false;
+			return m_inactive;
+		}
 
 		std::string save_path() const;
 		alert_manager& alerts() const;
@@ -1426,6 +1429,11 @@
 		// present
 		bool m_use_resume_save_path:1;
 
+		// if set to true, add web seed URLs loaded from resume
+		// data into this torrent instead of replacing the ones from the .torrent
+		// file
+		bool m_merge_resume_http_seeds:1;
+
 #if TORRENT_USE_ASSERTS
 	public:
 		// set to false until we've loaded resume data
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/torrent_info.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/torrent_info.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/torrent_info.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/torrent_info.hpp	2015-11-14 05:21:45.000000000 +0000
@@ -450,7 +450,7 @@
 		// insert custom HTTP headers in the requests to a specific web seed.
 		// 
 		// See http-seeding_ for more information.
- 		void add_url_seed(std::string const& url
+		void add_url_seed(std::string const& url
 			, std::string const& extern_auth = std::string()
 			, web_seed_entry::headers_t const& extra_headers = web_seed_entry::headers_t());
 		void add_http_seed(std::string const& url
diff -Nru libtorrent-rasterbar-1.0.6/include/libtorrent/version.hpp libtorrent-rasterbar-1.0.7/include/libtorrent/version.hpp
--- libtorrent-rasterbar-1.0.6/include/libtorrent/version.hpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/include/libtorrent/version.hpp	2015-11-14 05:22:43.000000000 +0000
@@ -33,15 +33,24 @@
 #ifndef TORRENT_VERSION_HPP_INCLUDED
 #define TORRENT_VERSION_HPP_INCLUDED
 
+#include "libtorrent/export.hpp"
+
 #define LIBTORRENT_VERSION_MAJOR 1
 #define LIBTORRENT_VERSION_MINOR 0
-#define LIBTORRENT_VERSION_TINY 6
+#define LIBTORRENT_VERSION_TINY 7
 
 // 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.0.6.0"
-#define LIBTORRENT_REVISION "$Rev$" 
+#define LIBTORRENT_VERSION "1.0.7.0"
+#define LIBTORRENT_REVISION "0dff874"
+namespace libtorrent {
+
+	// returns the libtorrent version as string form in this format:
+	// "<major>.<minor>.<tiny>.<tag>.<revision>"
+	TORRENT_EXPORT char const* version();
+
+}
 
 #endif
diff -Nru libtorrent-rasterbar-1.0.6/Jamfile libtorrent-rasterbar-1.0.7/Jamfile
--- libtorrent-rasterbar-1.0.6/Jamfile	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/Jamfile	2015-11-14 05:22:43.000000000 +0000
@@ -23,7 +23,7 @@
 	use-project /boost : $(BOOST_ROOT) ;
 }
 
-VERSION = 1.0.6 ;
+VERSION = 1.0.7 ;
 
 rule coverage ( properties * )
 {
@@ -156,7 +156,8 @@
 		result += <library>tcmalloc ;
 	}
 
-	if <toolset>gcc in $(properties)
+	if ( <toolset>gcc in $(properties)
+			|| <toolset>clang in $(properties) )
 		&& <target-os>linux in $(properties)
 		&& ( <variant>debug in $(properties)
 			|| <asserts>on in $(properties)
@@ -167,7 +168,7 @@
 	{
 		# for backtraces in assertion failures
 		# which only works on ELF targets with gcc
-		result += <linkflags>-export-dynamic <cxxflags>-rdynamic ;
+		result += <linkflags>-export-dynamic <linkflags>-rdynamic ;
 	}
 
 	if <boost>source in $(properties)
@@ -468,21 +469,23 @@
 
 # this is a trick to get filename paths to targets to become shorter
 # making it possible to build on windows, especially mingw seems particular
+# for release builds, disable optimizations as they bump GCC over the edge of
+# allowed memory usage on travis-ci
 variant test_release
 	: release : <asserts>production <debug-symbols>on
-	  <invariant-checks>full <boost-link>shared
-	  <export-extra>on <debug-iterators>on <boost>source <threading>multi
+	  <invariant-checks>full <boost-link>shared <optimization>off
+	  <export-extra>on <debug-iterators>on <threading>multi
 	;
 variant test_debug : debug
 	: <encryption>openssl <statistics>on <logging>verbose <disk-stats>on
 	  <dht>logging <request-log>on <allocator>debug <debug-iterators>on
 	  <invariant-checks>full <boost-link>shared
-	  <export-extra>on <debug-iterators>on <boost>source <threading>multi
+	  <export-extra>on <debug-iterators>on <threading>multi
 	;
 variant test_barebones : debug
 	: <ipv6>off <dht>off <extensions>off <logging>none <boost-link>shared
 	  <deprecated-functions>off <invariant-checks>off
-	  <export-extra>on <debug-iterators>on <boost>source <threading>multi
+	  <export-extra>on <debug-iterators>on <threading>multi
 	;
 
 
@@ -521,7 +524,7 @@
 # openssl on linux/bsd/macos etc.
 lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
 lib z : : <link>shared <name>z <search>/usr/lib ;
-lib crypto : : <name>crypto <search>/usr/lib <use>z ;
+lib crypto : : <name>crypto <link>shared <search>/usr/lib <use>z ;
 lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib ;
 lib dl : : <link>shared <name>dl ;
 
@@ -618,6 +621,7 @@
 	ConvertUTF
 	thread
 	xml_parse
+	version
 
 # -- extensions --
 	metadata_transfer
@@ -655,7 +659,7 @@
 	verify
 	;
 
-local usage-requirements = 
+local usage-requirements =
 	<include>./include
 	<include>./include/libtorrent
 	<include>/usr/sfw/include
@@ -744,7 +748,6 @@
 
 package.install install
  : <install-source-root>libtorrent
-   <install-no-version-symlinks>on
  :
  : torrent
  : $(headers)
Binary files /tmp/WBQ_OzDV3P/libtorrent-rasterbar-1.0.6/m4/._libtool.m4 and /tmp/PY6ChjGgAt/libtorrent-rasterbar-1.0.7/m4/._libtool.m4 differ
diff -Nru libtorrent-rasterbar-1.0.6/m4/libtool.m4 libtorrent-rasterbar-1.0.7/m4/libtool.m4
--- libtorrent-rasterbar-1.0.6/m4/libtool.m4	2015-07-30 04:11:41.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/m4/libtool.m4	2015-11-14 05:34:00.000000000 +0000
@@ -1,6 +1,6 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-#   Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc.
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -103,19 +103,36 @@
 dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 
 
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
 # _LT_CC_BASENAME(CC)
 # -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
 m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
 ])
 
 
@@ -720,6 +737,9 @@
 _LT_COPYING
 _LT_LIBTOOL_TAGS
 
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
 # ### BEGIN LIBTOOL CONFIG
 _LT_LIBTOOL_CONFIG_VARS
 _LT_LIBTOOL_TAG_VARS
@@ -727,6 +747,17 @@
 
 _LT_EOF
 
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
@@ -2202,6 +2233,47 @@
 ])# _LT_CMD_STRIPLIB
 
 
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
 # _LT_SYS_DYNAMIC_LINKER([TAG])
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
@@ -2212,6 +2284,7 @@
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
@@ -2306,6 +2379,9 @@
 # flags to be left without arguments
 need_version=unknown
 
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
 case $host_os in
 aix3*)
   version_type=linux # correct to gnu/linux during the next big refactor
@@ -2594,6 +2670,7 @@
   case $version_type in
     freebsd-elf*)
       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -2653,10 +2730,11 @@
     soname_spec='$libname$release$shared_ext$major'
     if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   hppa*64*)
     shrext_cmds='.sl'
@@ -2789,7 +2867,12 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Append ld.so.conf contents to the search path
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -3013,10 +3096,20 @@
 if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
   sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
+
 if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
   sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
 _LT_DECL([], [variables_saved_for_relink], [1],
     [Variables whose values should be saved in libtool wrapper scripts and
     restored at link time])
@@ -3049,8 +3142,10 @@
     [Whether we should hardcode library paths into libraries])
 _LT_DECL([], [sys_lib_search_path_spec], [2],
     [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
 ])# _LT_SYS_DYNAMIC_LINKER
 
 
@@ -7350,6 +7445,7 @@
 } # func_stripname_cnf
 ])# _LT_FUNC_STRIPNAME_CNF
 
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -7528,51 +7624,6 @@
   _LT_TAGVAR(postdep_objects,$1)=
   _LT_TAGVAR(postdeps,$1)=
   ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test yes != "$solaris_use_stlport4"; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test yes != "$solaris_use_stlport4"; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
 esac
 ])
 
Binary files /tmp/WBQ_OzDV3P/libtorrent-rasterbar-1.0.6/m4/._lt~obsolete.m4 and /tmp/PY6ChjGgAt/libtorrent-rasterbar-1.0.7/m4/._lt~obsolete.m4 differ
diff -Nru libtorrent-rasterbar-1.0.6/m4/lt~obsolete.m4 libtorrent-rasterbar-1.0.7/m4/lt~obsolete.m4
--- libtorrent-rasterbar-1.0.6/m4/lt~obsolete.m4	2015-07-30 04:11:41.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/m4/lt~obsolete.m4	2015-11-14 05:34:01.000000000 +0000
@@ -1,6 +1,6 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2014 Free Software
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
 #   Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
Binary files /tmp/WBQ_OzDV3P/libtorrent-rasterbar-1.0.6/m4/._ltoptions.m4 and /tmp/PY6ChjGgAt/libtorrent-rasterbar-1.0.7/m4/._ltoptions.m4 differ
diff -Nru libtorrent-rasterbar-1.0.6/m4/ltoptions.m4 libtorrent-rasterbar-1.0.7/m4/ltoptions.m4
--- libtorrent-rasterbar-1.0.6/m4/ltoptions.m4	2015-07-30 04:11:41.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/m4/ltoptions.m4	2015-11-14 05:34:00.000000000 +0000
@@ -1,6 +1,6 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004-2005, 2007-2009, 2011-2014 Free Software
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
Binary files /tmp/WBQ_OzDV3P/libtorrent-rasterbar-1.0.6/m4/._ltsugar.m4 and /tmp/PY6ChjGgAt/libtorrent-rasterbar-1.0.7/m4/._ltsugar.m4 differ
diff -Nru libtorrent-rasterbar-1.0.6/m4/ltsugar.m4 libtorrent-rasterbar-1.0.7/m4/ltsugar.m4
--- libtorrent-rasterbar-1.0.6/m4/ltsugar.m4	2015-07-30 04:11:41.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/m4/ltsugar.m4	2015-11-14 05:34:00.000000000 +0000
@@ -1,6 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2014 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
diff -Nru libtorrent-rasterbar-1.0.6/m4/ltversion.m4 libtorrent-rasterbar-1.0.7/m4/ltversion.m4
--- libtorrent-rasterbar-1.0.6/m4/ltversion.m4	2015-07-30 04:11:41.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/m4/ltversion.m4	2015-11-14 05:34:00.000000000 +0000
@@ -1,6 +1,6 @@
 # ltversion.m4 -- version numbers			-*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 4151 ltversion.m4
+# serial 4179 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4.4])
-m4_define([LT_PACKAGE_REVISION], [2.4.4])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.4'
-macro_revision='2.4.4'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru libtorrent-rasterbar-1.0.6/Makefile.in libtorrent-rasterbar-1.0.7/Makefile.in
--- libtorrent-rasterbar-1.0.6/Makefile.in	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/Makefile.in	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -80,20 +90,6 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/libtorrent-rasterbar.pc.in \
-	$(srcdir)/libtorrent-rasterbar-cmake.pc.in AUTHORS COPYING \
-	ChangeLog NEWS README build-aux/compile build-aux/config.guess \
-	build-aux/config.rpath build-aux/config.sub \
-	build-aux/install-sh build-aux/missing build-aux/ltmain.sh \
-	$(top_srcdir)/build-aux/compile \
-	$(top_srcdir)/build-aux/config.guess \
-	$(top_srcdir)/build-aux/config.rpath \
-	$(top_srcdir)/build-aux/config.sub \
-	$(top_srcdir)/build-aux/install-sh \
-	$(top_srcdir)/build-aux/ltmain.sh \
-	$(top_srcdir)/build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
 	$(top_srcdir)/m4/ax_boost_python.m4 \
@@ -109,6 +105,8 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -200,6 +198,19 @@
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/libtorrent-rasterbar-cmake.pc.in \
+	$(srcdir)/libtorrent-rasterbar.pc.in \
+	$(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.rpath \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing AUTHORS COPYING ChangeLog NEWS \
+	build-aux/compile build-aux/config.guess \
+	build-aux/config.rpath build-aux/config.sub \
+	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -297,6 +308,7 @@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -545,7 +557,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -786,15 +797,15 @@
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -830,17 +841,17 @@
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1020,6 +1031,8 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-pkgconfigDATA
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru libtorrent-rasterbar-1.0.6/README libtorrent-rasterbar-1.0.7/README
--- libtorrent-rasterbar-1.0.6/README	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-libtorrent is an open source C++ library implementing the BitTorrent protocol,
-along with most popular extensions, making it suitable for real world
-deployment. It is configurable to be able to fit both servers and embedded
-devices.
-
-The main goals of libtorrent are to be efficient and easy to use.
-
-See docs/index.html for more detailed build and usage instructions.
-
-To build with boost-build, run:
-
-   b2
-
-See docs/building.html for more details on how to build and which configuration
-options are available.
-
diff -Nru libtorrent-rasterbar-1.0.6/src/alert.cpp libtorrent-rasterbar-1.0.7/src/alert.cpp
--- libtorrent-rasterbar-1.0.6/src/alert.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/alert.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -112,7 +112,8 @@
 		if (ec)
 		{
 			snprintf(msg, sizeof(msg), "%s: read_piece %u failed: %s"
-				, torrent_alert::message().c_str() , piece, ec.message().c_str());
+				, torrent_alert::message().c_str() , piece
+				, convert_from_native(ec.message()).c_str());
 		}
 		else
 		{
@@ -164,7 +165,8 @@
 	{
 		char ret[200 + TORRENT_MAX_PATH * 2];
 		snprintf(ret, sizeof(ret), "%s: failed to rename file %d: %s"
-			, torrent_alert::message().c_str(), index, convert_from_native(error.message()).c_str());
+			, torrent_alert::message().c_str(), index
+			, convert_from_native(error.message()).c_str());
 		return ret;
 	}
 
@@ -233,7 +235,7 @@
 		char ret[400];
 		snprintf(ret, sizeof(ret), "%s (%d) %s \"%s\" (%d)"
 			, tracker_alert::message().c_str(), status_code
-			, error.message().c_str(), msg.c_str(), times_in_row);
+			, convert_from_native(error.message()).c_str(), msg.c_str(), times_in_row);
 		return ret;
 	}
 
diff -Nru libtorrent-rasterbar-1.0.6/src/asio.cpp libtorrent-rasterbar-1.0.7/src/asio.cpp
--- libtorrent-rasterbar-1.0.6/src/asio.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/asio.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -7,6 +7,8 @@
 
 #include "libtorrent/config.hpp"
 
+#ifdef TORRENT_BUILDING_SHARED
+
 #define TORRENT_HAS_ASIO_DECL x ## BOOST_ASIO_DECL
 
 // only define BOOST_ASIO_DECL if it hasn't already been defined
@@ -15,6 +17,8 @@
 #define BOOST_ASIO_DECL BOOST_SYMBOL_EXPORT
 #endif
 
+#endif // TORRENT_BUILDING_SHARED
+
 #if BOOST_VERSION >= 104500
 #include <boost/asio/impl/src.hpp>
 #elif BOOST_VERSION >= 104400
diff -Nru libtorrent-rasterbar-1.0.6/src/broadcast_socket.cpp libtorrent-rasterbar-1.0.7/src/broadcast_socket.cpp
--- libtorrent-rasterbar-1.0.6/src/broadcast_socket.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/broadcast_socket.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -148,12 +148,20 @@
 	bool supports_ipv6()
 	{
 #if TORRENT_USE_IPV6
+#ifdef TORRENT_WINDOWS
 		TORRENT_TRY {
 			error_code ec;
 			address::from_string("::1", ec);
 			return !ec;
 		} TORRENT_CATCH(std::exception&) { return false; }
 #else
+		io_service ios;
+		tcp::socket test(ios);
+		error_code ec;
+		test.open(tcp::v6(), ec);
+		return !bool(ec);
+#endif // WINDOWS
+#else
 		return false;
 #endif
 	}
diff -Nru libtorrent-rasterbar-1.0.6/src/bt_peer_connection.cpp libtorrent-rasterbar-1.0.7/src/bt_peer_connection.cpp
--- libtorrent-rasterbar-1.0.6/src/bt_peer_connection.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/bt_peer_connection.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -263,7 +263,8 @@
 	{
 		INVARIANT_CHECK;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 		
 #ifdef TORRENT_VERBOSE_LOGGING
 		peer_log("==> DHT_PORT [ %d ]", listen_port);
@@ -277,7 +278,8 @@
 	void bt_peer_connection::write_have_all()
 	{
 		INVARIANT_CHECK;
-		TORRENT_ASSERT(m_sent_handshake && !m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(!m_sent_bitfield);
 #if TORRENT_USE_ASSERTS
 		m_sent_bitfield = true;
 #endif
@@ -291,7 +293,8 @@
 	void bt_peer_connection::write_have_none()
 	{
 		INVARIANT_CHECK;
-		TORRENT_ASSERT(m_sent_handshake && !m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(!m_sent_bitfield);
 #if TORRENT_USE_ASSERTS
 		m_sent_bitfield = true;
 #endif
@@ -316,7 +319,8 @@
 		peer_log("==> REJECT_PIECE [ piece: %d | s: %d | l: %d ]"
 			, r.piece, r.start, r.length);
 #endif
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 		TORRENT_ASSERT(associated_torrent().lock()->valid_metadata());
 
 		char msg[] = {0,0,0,13, msg_reject_request,0,0,0,0, 0,0,0,0, 0,0,0,0};
@@ -333,7 +337,8 @@
 
 		if (!m_supports_fast) return;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 		TORRENT_ASSERT(associated_torrent().lock()->valid_metadata());
 
 		char msg[] = {0,0,0,5, msg_allowed_fast, 0, 0, 0, 0};
@@ -348,7 +353,8 @@
 
 		if (!m_supports_fast) return;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 		TORRENT_ASSERT(associated_torrent().lock()->valid_metadata());
 
 		boost::shared_ptr<torrent> t = associated_torrent().lock();
@@ -1953,7 +1959,8 @@
 	{
 		INVARIANT_CHECK;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 		TORRENT_ASSERT(associated_torrent().lock()->valid_metadata());
 
 		char msg[17] = {0,0,0,13, msg_cancel};
@@ -1971,7 +1978,8 @@
 	{
 		INVARIANT_CHECK;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 		TORRENT_ASSERT(associated_torrent().lock()->valid_metadata());
 
 		char msg[17] = {0,0,0,13, msg_request};
@@ -1989,7 +1997,8 @@
 
 		boost::shared_ptr<torrent> t = associated_torrent().lock();
 		TORRENT_ASSERT(t);
-		TORRENT_ASSERT(m_sent_handshake && !m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(!m_sent_bitfield);
 		TORRENT_ASSERT(t->valid_metadata());
 
 		// in this case, have_all or have_none should be sent instead
@@ -2238,7 +2247,8 @@
 	{
 		INVARIANT_CHECK;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 
 		if (is_choked()) return;
 		char msg[] = {0,0,0,1,msg_choke};
@@ -2249,7 +2259,8 @@
 	{
 		INVARIANT_CHECK;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 
 		char msg[] = {0,0,0,1,msg_unchoke};
 		send_buffer(msg, sizeof(msg));
@@ -2267,7 +2278,8 @@
 	{
 		INVARIANT_CHECK;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 
 		char msg[] = {0,0,0,1,msg_interested};
 		send_buffer(msg, sizeof(msg));
@@ -2277,7 +2289,8 @@
 	{
 		INVARIANT_CHECK;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 
 		char msg[] = {0,0,0,1,msg_not_interested};
 		send_buffer(msg, sizeof(msg));
@@ -2289,7 +2302,8 @@
 		TORRENT_ASSERT(associated_torrent().lock()->valid_metadata());
 		TORRENT_ASSERT(index >= 0);
 		TORRENT_ASSERT(index < associated_torrent().lock()->torrent_file().num_pieces());
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 
 		char msg[] = {0,0,0,5,msg_have,0,0,0,0};
 		char* ptr = msg + 5;
@@ -2301,7 +2315,8 @@
 	{
 		INVARIANT_CHECK;
 
-		TORRENT_ASSERT(m_sent_handshake && m_sent_bitfield);
+		TORRENT_ASSERT(m_sent_handshake);
+		TORRENT_ASSERT(m_sent_bitfield);
 
 		boost::shared_ptr<torrent> t = associated_torrent().lock();
 		TORRENT_ASSERT(t);
diff -Nru libtorrent-rasterbar-1.0.6/src/disk_io_thread.cpp libtorrent-rasterbar-1.0.7/src/disk_io_thread.cpp
--- libtorrent-rasterbar-1.0.6/src/disk_io_thread.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/disk_io_thread.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -1523,6 +1523,7 @@
 			}
 		}
 #endif
+
 		// 1 = forward in list, -1 = backwards in list
 		int elevator_direction = 1;
 
@@ -1830,9 +1831,21 @@
 						// if we don't know how much RAM we have, just set the
 						// cache size to 16 MiB (1024 blocks)
 						if (m_physical_ram == 0)
+						{
 							m_settings.cache_size = 1024;
+						}
+						else if (sizeof(void*) == 4)
+						{
+							// 32 bit builds should  capped below 2 GB of memory, even
+							// when more actual ram is available, because we're still
+							// constrained by the 32 bit virtual address space.
+							m_settings.cache_size = (std::min)(boost::uint64_t(2) * 1024
+								* 1024 * 1024 * 3 / 4, m_physical_ram / 8) / m_block_size;
+						}
 						else
+						{
 							m_settings.cache_size = m_physical_ram / 8 / m_block_size;
+						}
 					}
 					break;
 				}
diff -Nru libtorrent-rasterbar-1.0.6/src/file.cpp libtorrent-rasterbar-1.0.7/src/file.cpp
--- libtorrent-rasterbar-1.0.6/src/file.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/file.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -106,23 +106,6 @@
 #define lseek lseek64
 #endif
 
-#include <asm/unistd.h> // For __NR_fallocate
-
-// circumvent the lack of support in glibc
-static int my_fallocate(int fd, int mode, loff_t offset, loff_t len)
-{
-#ifdef __NR_fallocate
-	// the man page on fallocate differes between versions of linux.
-	// it appears that fallocate in fact sets errno and returns -1
-	// on failure.
-	return syscall(__NR_fallocate, fd, mode, offset, len);
-#else
-	// pretend that the system call doesn't exist
-	errno = ENOSYS;
-	return -1;
-#endif
-}
-
 #elif defined __APPLE__ && defined __MACH__ && MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
 // mac specifics
 
@@ -1632,6 +1615,10 @@
 			}
 #endif // TORRENT_LINUX
 
+			// returning 0 means end of file. Terminate the loop, there's no
+			// point in trying to read more
+			if (tmp_ret == 0) break;
+
 			num_bufs -= nbufs;
 			bufs += nbufs;
 		}
@@ -1886,6 +1873,10 @@
 			}
 #endif // TORRENT_LINUX
 
+			// returning 0 means end of file. Terminate the loop, there's no
+			// point in trying to read more
+			if (tmp_ret == 0) break;
+
 			num_bufs -= nbufs;
 			bufs += nbufs;
 		}
@@ -2292,23 +2283,6 @@
 			int ret;
 #endif
 
-#if defined TORRENT_LINUX
-			ret = my_fallocate(m_fd, 0, 0, s);
-			// if we return 0, everything went fine
-			// the fallocate call succeeded
-			if (ret == 0) return true;
-			// otherwise, something went wrong. If the error
-			// is ENOSYS, just keep going and do it the old-fashioned
-			// way. If fallocate failed with some other error, it
-			// probably means the user should know about it, error out
-			// and report it.
-			if (errno != ENOSYS && errno != EOPNOTSUPP && errno != EINVAL)
-			{
-				ec.assign(errno, get_posix_category());
-				return false;
-			}
-#endif // TORRENT_LINUX
-
 #if TORRENT_HAS_FALLOCATE
 			// if fallocate failed, we have to use posix_fallocate
 			// which can be painfully slow
@@ -2316,7 +2290,7 @@
 			// define TORRENT_HAS_FALLOCATE to 0.
 			ret = posix_fallocate(m_fd, 0, s);
 			// posix_allocate fails with EINVAL in case the underlying
-			// filesystem does bot support this operation
+			// filesystem does not support this operation
 			if (ret != 0 && ret != EINVAL)
 			{
 				ec.assign(ret, get_posix_category());
diff -Nru libtorrent-rasterbar-1.0.6/src/kademlia/routing_table.cpp libtorrent-rasterbar-1.0.7/src/kademlia/routing_table.cpp
--- libtorrent-rasterbar-1.0.6/src/kademlia/routing_table.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/kademlia/routing_table.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -280,7 +280,7 @@
 			id_shift = bucket_index;
 		else
 			id_shift = bucket_index + 1;
-		
+
 		for (bucket_t::const_iterator j = i->live_nodes.begin()
 			, end(i->live_nodes.end()); j != end; ++j)
 		{
@@ -389,7 +389,7 @@
 }
 
 node_entry* routing_table::find_node(udp::endpoint const& ep
-	, routing_table::table_t::iterator* bucket) 
+	, routing_table::table_t::iterator* bucket)
 {
 	for (table_t::iterator i = m_buckets.begin()
 		, end(m_buckets.end()); i != end; ++i)
@@ -416,7 +416,7 @@
 }
 
 void routing_table::remove_node(node_entry* n
-	, routing_table::table_t::iterator bucket) 
+	, routing_table::table_t::iterator bucket)
 {
 	INVARIANT_CHECK;
 
@@ -535,7 +535,7 @@
 			remove_node(existing, existing_bucket);
 		}
 	}
-	
+
 	table_t::iterator i = find_bucket(e.id);
 	bucket_t& b = i->live_nodes;
 	bucket_t& rb = i->replacements;
@@ -636,8 +636,10 @@
 	// can we split the bucket?
 	// only nodes that haven't failed can split the bucket, and we can only
 	// split the last bucket
-	bool can_split = (boost::next(i) == m_buckets.end() && m_buckets.size() < 159)
-		&& e.fail_count() == 0;
+	const bool can_split = (boost::next(i) == m_buckets.end()
+		&& m_buckets.size() < 159)
+		&& e.fail_count() == 0
+		&& (i == m_buckets.begin() || boost::prior(i)->live_nodes.size() > 1);
 
 	if (e.pinged() && e.fail_count() == 0)
 	{
@@ -678,7 +680,7 @@
 //			TORRENT_LOG(table) << "replacing stale node: " << e.id << " " << e.addr();
 			return node_added;
 		}
-		
+
 		// in order to provide as few lookups as possible before finding
 		// the data someone is looking for, make sure there is an affinity
 		// towards having a good spread of node IDs in each bucket
@@ -968,7 +970,7 @@
 	// claiming the same ID. The node we have in our routing
 	// table is not necessarily stale
 	if (j->ep() != ep) return;
-	
+
 	if (rb.empty())
 	{
 		j->timed_out();
@@ -1088,7 +1090,7 @@
 	{
 		--j;
 		bucket_t& b = j->live_nodes;
-	
+
 		if (options & include_failed)
 		{
 			std::copy(b.begin(), b.end(), std::back_inserter(l));
diff -Nru libtorrent-rasterbar-1.0.6/src/lazy_bdecode.cpp libtorrent-rasterbar-1.0.7/src/lazy_bdecode.cpp
--- libtorrent-rasterbar-1.0.6/src/lazy_bdecode.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/lazy_bdecode.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -126,10 +126,11 @@
 	{
 		char const* const orig_start = start;
 		ret.clear();
-		if (start == end) return 0;
 
 		std::vector<lazy_entry*> stack;
 
+		if (start == end) TORRENT_FAIL_BDECODE(bdecode_errors::unexpected_eof);
+
 		stack.push_back(&ret);
 		while (start <= end)
 		{
@@ -543,7 +544,7 @@
 			line_len += 4;
 			break;
 		}
-	
+
 		if (line_len > limit) return -1;
 		return line_len;
 	}
diff -Nru libtorrent-rasterbar-1.0.6/src/magnet_uri.cpp libtorrent-rasterbar-1.0.7/src/magnet_uri.cpp
--- libtorrent-rasterbar-1.0.6/src/magnet_uri.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/magnet_uri.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -154,7 +154,21 @@
 		if (btih.compare(0, 9, "urn:btih:") != 0) return torrent_handle();
 
 		if (btih.size() == 40 + 9) from_hex(&btih[9], 40, (char*)&params.info_hash[0]);
-		else params.info_hash.assign(base32decode(btih.substr(9)));
+		else if (btih.size() == 32 + 9)
+		{
+			std::string ih = base32decode(btih.substr(9));
+			if (ih.size() != 20)
+			{
+				ec = errors::invalid_info_hash;
+				return torrent_handle();
+			}
+			params.info_hash.assign(ih);
+		}
+		else
+		{
+			ec = errors::invalid_info_hash;
+			return torrent_handle();
+		}
 
 		return ses.add_torrent(params);
 	}
diff -Nru libtorrent-rasterbar-1.0.6/src/Makefile.am libtorrent-rasterbar-1.0.7/src/Makefile.am
--- libtorrent-rasterbar-1.0.6/src/Makefile.am	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/Makefile.am	2015-11-14 05:21:45.000000000 +0000
@@ -120,6 +120,7 @@
   utp_stream.cpp                  \
   web_peer_connection.cpp         \
   xml_parse.cpp                   \
+  version.cpp                     \
   \
   $(KADEMLIA_SOURCES)             \
   $(GEOIP_SOURCES)                \
diff -Nru libtorrent-rasterbar-1.0.6/src/Makefile.in libtorrent-rasterbar-1.0.7/src/Makefile.in
--- libtorrent-rasterbar-1.0.6/src/Makefile.in	2015-07-30 04:11:47.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/Makefile.in	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -80,8 +90,6 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
 	$(top_srcdir)/m4/ax_boost_python.m4 \
@@ -97,6 +105,7 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -154,7 +163,7 @@
 	udp_socket.cpp udp_tracker_connection.cpp upnp.cpp \
 	ut_metadata.cpp ut_pex.cpp utf8.cpp utp_socket_manager.cpp \
 	utp_stream.cpp web_peer_connection.cpp xml_parse.cpp \
-	kademlia/dht_tracker.cpp kademlia/find_data.cpp \
+	version.cpp kademlia/dht_tracker.cpp kademlia/find_data.cpp \
 	kademlia/node.cpp kademlia/node_id.cpp kademlia/refresh.cpp \
 	kademlia/routing_table.cpp kademlia/rpc_manager.cpp \
 	kademlia/logging.cpp kademlia/traversal_algorithm.cpp \
@@ -205,7 +214,7 @@
 	torrent_info.lo time.lo timestamp_history.lo \
 	tracker_manager.lo udp_socket.lo udp_tracker_connection.lo \
 	upnp.lo ut_metadata.lo ut_pex.lo utf8.lo utp_socket_manager.lo \
-	utp_stream.lo web_peer_connection.lo xml_parse.lo \
+	utp_stream.lo web_peer_connection.lo xml_parse.lo version.lo \
 	$(am__objects_1) $(am__objects_2) $(am__objects_3)
 libtorrent_rasterbar_la_OBJECTS =  \
 	$(am_libtorrent_rasterbar_la_OBJECTS)
@@ -295,6 +304,8 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -351,6 +362,7 @@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -565,6 +577,7 @@
   utp_stream.cpp                  \
   web_peer_connection.cpp         \
   xml_parse.cpp                   \
+  version.cpp                     \
   \
   $(KADEMLIA_SOURCES)             \
   $(GEOIP_SOURCES)                \
@@ -600,7 +613,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -815,6 +827,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utp_socket_manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utp_stream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_connection_base.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web_peer_connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_parse.Plo@am__quote@
@@ -1097,6 +1110,8 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru libtorrent-rasterbar-1.0.6/src/parse_url.cpp libtorrent-rasterbar-1.0.7/src/parse_url.cpp
--- libtorrent-rasterbar-1.0.6/src/parse_url.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/parse_url.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -101,16 +101,19 @@
 				ec = errors::expected_close_bracket_in_address;
 				goto exit;
 			}
+			// strip the brackets
+			hostname.assign(start + 1, port_pos);
 			port_pos = std::find(port_pos, url.end(), ':');
 		}
 		else
 		{
 			port_pos = std::find(start, url.end(), ':');
+			if (port_pos < end) hostname.assign(start, port_pos);
+			else hostname.assign(start, end);
 		}
 
 		if (port_pos < end)
 		{
-			hostname.assign(start, port_pos);
 			++port_pos;
 			for (std::string::iterator i = port_pos; i < end; ++i)
 			{
@@ -120,10 +123,6 @@
 			}
 			port = std::atoi(std::string(port_pos, end).c_str());
 		}
-		else
-		{
-			hostname.assign(start, end);
-		}
 
 		start = end;
 exit:
diff -Nru libtorrent-rasterbar-1.0.6/src/peer_connection.cpp libtorrent-rasterbar-1.0.7/src/peer_connection.cpp
--- libtorrent-rasterbar-1.0.6/src/peer_connection.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/peer_connection.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -1125,7 +1125,8 @@
 				// as part of DHT traffic. The fact that we got an incoming
 				// connection on this info-hash, means the other end, making this
 				// connection fished it out of the DHT chatter. That's suspicious.
-				m_ses.m_ip_filter.add_rule(m_remote.address(), m_remote.address(), 0);
+				m_ses.m_ip_filter.add_rule(m_remote.address(), m_remote.address()
+					, ip_filter::blocked);
 			}
 #endif
 			disconnect(errors::invalid_info_hash, 1);
@@ -4010,6 +4011,9 @@
 
 	void peer_connection::superseed_piece(int replace_piece, int new_piece)
 	{
+		if (is_connecting()) return;
+		if (in_handshake()) return;
+
 		if (new_piece == -1)
 		{
 			if (m_superseed_piece[0] == -1) return;
@@ -4206,6 +4210,7 @@
 		}
 
 		if (t->super_seeding()
+			&& t->ready_for_connections()
 			&& !m_peer_interested
 			&& m_became_uninterested + seconds(10) < now)
 		{
@@ -4561,7 +4566,7 @@
 
 		// only add new piece-chunks if the send buffer is small enough
 		// otherwise there will be no end to how large it will be!
-		
+
 		boost::uint64_t upload_rate = int(m_statistics.upload_rate());
 
 		int buffer_size_watermark = int(upload_rate
@@ -4587,9 +4592,10 @@
 		{
 			TORRENT_ASSERT(t->ready_for_connections());
 			peer_request& r = m_requests.front();
-			
+
 			TORRENT_ASSERT(r.piece >= 0);
 			TORRENT_ASSERT(r.piece < (int)m_have_piece.size());
+			TORRENT_ASSERT(r.piece < t->torrent_file().num_pieces());
 			TORRENT_ASSERT(t->have_piece(r.piece));
 			TORRENT_ASSERT(r.start + r.length <= t->torrent_file().piece_size(r.piece));
 			TORRENT_ASSERT(r.length > 0 && r.start >= 0);
diff -Nru libtorrent-rasterbar-1.0.6/src/piece_picker.cpp libtorrent-rasterbar-1.0.7/src/piece_picker.cpp
--- libtorrent-rasterbar-1.0.6/src/piece_picker.cpp	2015-07-30 02:26:28.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/piece_picker.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -63,7 +63,7 @@
 namespace libtorrent
 {
 
-	const piece_block piece_block::invalid(0x7FFFF, 0x1FFF);
+	const piece_block piece_block::invalid((std::numeric_limits<int>::max)(), (std::numeric_limits<int>::max)());
 
 	piece_picker::piece_picker()
 		: m_seeds(0)
diff -Nru libtorrent-rasterbar-1.0.6/src/session_impl.cpp libtorrent-rasterbar-1.0.7/src/session_impl.cpp
--- libtorrent-rasterbar-1.0.6/src/session_impl.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/session_impl.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -271,7 +271,7 @@
 		tu->system_time = min_time() + microsec(stime / 10);
 #endif
 	}
-#endif //TORRENT_STATS	
+#endif //TORRENT_STATS
 
 	struct seed_random_generator
 	{
@@ -331,8 +331,8 @@
 #endif
 		TORRENT_SETTING(boolean, free_torrent_hashes)
 		TORRENT_SETTING(boolean, upnp_ignore_nonrouters)
- 		TORRENT_SETTING(integer, send_buffer_low_watermark)
- 		TORRENT_SETTING(integer, send_buffer_watermark)
+		TORRENT_SETTING(integer, send_buffer_low_watermark)
+		TORRENT_SETTING(integer, send_buffer_watermark)
 		TORRENT_SETTING(integer, send_buffer_watermark_factor)
 #ifndef TORRENT_NO_DEPRECATE
 		TORRENT_SETTING(boolean, auto_upload_slots)
@@ -733,9 +733,20 @@
 #endif
 
 		error_code ec;
-		if (!listen_interface) listen_interface = "0.0.0.0";
+		if (!listen_interface || listen_interface[0] == '\0') listen_interface = "0.0.0.0";
 		m_listen_interface = tcp::endpoint(address::from_string(listen_interface, ec), listen_port_range.first);
-		TORRENT_ASSERT_VAL(!ec, ec);
+
+		if (ec)
+		{
+			m_listen_interface = tcp::endpoint(address_v4::any(), listen_port_range.first);
+			if (m_alerts.should_post<listen_failed_alert>())
+				m_alerts.post_alert(listen_failed_alert(m_listen_interface
+					, listen_failed_alert::parse_addr, ec, listen_failed_alert::tcp));
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+			session_log("failed to parse listen interface: \"%s\": (%d) %s"
+				, listen_interface ? listen_interface : "", ec.value(), ec.message().c_str());
+#endif
+		}
 
 		// ---- generate a peer id ----
 		static seed_random_generator seeder;
@@ -1341,7 +1352,7 @@
 		TORRENT_ASSERT(is_network_thread());
 
 		lazy_entry const* settings;
-	  
+
 		if (e->type() != lazy_entry::dict_t) return;
 
 		for (int i = 0; i < int(sizeof(all_settings)/sizeof(all_settings[0])); ++i)
@@ -1349,13 +1360,19 @@
 			session_category const& c = all_settings[i];
 			settings = e->dict_find_dict(c.name);
 			if (!settings) continue;
-			load_struct(*settings, reinterpret_cast<char*>(this) + c.offset, c.map, c.num_entries);
+			if (c.offset == offsetof(session_impl, m_settings))
+			{
+				// load settings into a local variable so we can update the settings
+				// via the normal set_settings() path
+				session_settings sett;
+				load_struct(*settings, reinterpret_cast<char*>(&sett), c.map, c.num_entries);
+				set_settings(sett);
+			}
+			else
+			{
+				load_struct(*settings, reinterpret_cast<char*>(this) + c.offset, c.map, c.num_entries);
+			}
 		}
-		
-		update_rate_settings();
-		update_connections_limit();
-		update_unchoke_limit();
-		m_alerts.set_alert_queue_size_limit(m_settings.alert_queue_size);
 
 		// in case we just set a socks proxy, we might have to
 		// open the socks incoming connection
@@ -4194,7 +4211,7 @@
 			boost::shared_ptr<torrent> t;
 			do
 			{
-		  		t = m_dht_torrents.front().lock();
+				t = m_dht_torrents.front().lock();
 				m_dht_torrents.pop_front();
 			}
 			while (!t && !m_dht_torrents.empty());
@@ -4212,7 +4229,7 @@
 		++m_next_dht_torrent;
 		if (m_next_dht_torrent == m_torrents.end())
 			m_next_dht_torrent = m_torrents.begin();
-  	}
+	}
 #endif
 
 	void session_impl::on_lsd_announce(error_code const& e)
@@ -4262,23 +4279,25 @@
 				|| t->state() == torrent_status::queued_for_checking))
 				continue;
 
-			--dht_limit;
-			--lsd_limit;
-			--tracker_limit;
-			t->set_announce_to_dht(dht_limit >= 0);
-			t->set_announce_to_trackers(tracker_limit >= 0);
-			t->set_announce_to_lsd(lsd_limit >= 0);
-   
 			if (!t->is_paused() && t->is_inactive()
 				&& hard_limit > 0)
 			{
 				// the hard limit takes inactive torrents into account, but the
 				// download and seed limits don't.
+
+				t->set_announce_to_dht(--dht_limit >= 0);
+				t->set_announce_to_trackers(--tracker_limit >= 0);
+				t->set_announce_to_lsd(--lsd_limit >= 0);
+
 				continue;
 			}
 
 			if (type_limit > 0 && hard_limit > 0)
 			{
+				t->set_announce_to_dht(--dht_limit >= 0);
+				t->set_announce_to_trackers(--tracker_limit >= 0);
+				t->set_announce_to_lsd(--lsd_limit >= 0);
+
 				--hard_limit;
 				--type_limit;
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
@@ -4293,6 +4312,9 @@
 #endif
 				// use graceful pause for auto-managed torrents
 				t->set_allow_peers(false, true);
+				t->set_announce_to_dht(false);
+				t->set_announce_to_trackers(false);
+				t->set_announce_to_lsd(false);
 			}
 		}
 	}
@@ -4330,7 +4352,7 @@
 			lsd_limit = (std::numeric_limits<int>::max)();
 		if (tracker_limit == -1)
 			tracker_limit = (std::numeric_limits<int>::max)();
-            
+
 		for (torrent_map::iterator i = m_torrents.begin()
 			, end(m_torrents.end()); i != end; ++i)
 		{
@@ -4397,7 +4419,7 @@
 	{
 		TORRENT_ASSERT(is_network_thread());
 		if (m_allowed_upload_slots == 0) return;
-	
+
 		std::vector<policy::peer*> opt_unchoke;
 
 		for (connection_map::iterator i = m_connections.begin()
diff -Nru libtorrent-rasterbar-1.0.6/src/socket_type.cpp libtorrent-rasterbar-1.0.7/src/socket_type.cpp
--- libtorrent-rasterbar-1.0.6/src/socket_type.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/socket_type.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -171,8 +171,8 @@
 				get<http_stream>()->~http_stream();
 				break;
 			case socket_type_int_impl<utp_stream>::value:
-					  get<utp_stream>()->~utp_stream();
-					  break;
+				get<utp_stream>()->~utp_stream();
+				break;
 #if TORRENT_USE_I2P
 			case socket_type_int_impl<i2p_stream>::value:
 				get<i2p_stream>()->~i2p_stream();
diff -Nru libtorrent-rasterbar-1.0.6/src/torrent.cpp libtorrent-rasterbar-1.0.7/src/torrent.cpp
--- libtorrent-rasterbar-1.0.6/src/torrent.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/torrent.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -102,7 +102,7 @@
 			: ip(a)
 			, tor(t)
 		{ TORRENT_ASSERT(t != 0); }
-		
+
 		bool operator()(session_impl::connection_map::value_type const& c) const
 		{
 			tcp::endpoint const& sender = c->remote();
@@ -118,7 +118,7 @@
 	struct peer_by_id
 	{
 		peer_by_id(const peer_id& i): pid(i) {}
-		
+
 		bool operator()(session_impl::connection_map::value_type const& p) const
 		{
 			if (p->pid() != pid) return false;
@@ -223,6 +223,7 @@
 		, m_magnet_link(false)
 		, m_apply_ip_filter(p.flags & add_torrent_params::flag_apply_ip_filter)
 		, m_merge_resume_trackers(p.flags & add_torrent_params::flag_merge_resume_trackers)
+		, m_merge_resume_http_seeds(p.flags & add_torrent_params::flag_merge_resume_http_seeds)
 		, m_padding(0)
 		, m_priority(0)
 		, m_complete(0xffffff)
@@ -280,6 +281,9 @@
 		if (!m_torrent_file)
 			m_torrent_file = (p.ti ? p.ti : new torrent_info(info_hash));
 
+		std::vector<web_seed_entry> const& web_seeds = m_torrent_file->web_seeds();
+		m_web_seeds.insert(m_web_seeds.end(), web_seeds.begin(), web_seeds.end());
+
 		// add web seeds from add_torrent_params
 		for (std::vector<std::string>::const_iterator i = p.url_seeds.begin()
 			, end(p.url_seeds.end()); i != end; ++i)
@@ -393,7 +397,7 @@
 	}
 
 #if 0
-	
+
 	// NON BOTTLED VERSION. SUPPORTS PROGRESS REPORTING
 
 	// since this download is not bottled, this callback will
@@ -463,7 +467,7 @@
 			return;
 		}
 		std::vector<char>().swap(m_torrent_file_buf);
-		
+
 		// update our torrent_info object and move the
 		// torrent from the old info-hash to the new one
 		// as we replace the torrent_info object
@@ -571,7 +575,7 @@
 			pause();
 			return;
 		}
-		
+
 		// update our torrent_info object and move the
 		// torrent from the old info-hash to the new one
 		// as we replace the torrent_info object
@@ -675,7 +679,7 @@
 		}
 
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
-		debug_log("*** LEAVING SEED MODE (%s)", seed ? "as seed" : "as non-seed");
+		debug_log("*** LEAVING SEED MODE (%s)", m_seed_mode ? "as seed" : "as non-seed");
 #endif
 		m_seed_mode = false;
 		// seed is false if we turned out not
@@ -799,7 +803,7 @@
 		TORRENT_ASSERT(!m_url.empty());
 		TORRENT_ASSERT(!m_torrent_file->is_valid());
 		boost::shared_ptr<http_connection> conn(
-			new http_connection(m_ses.m_io_service, m_ses.m_half_open			        
+			new http_connection(m_ses.m_io_service, m_ses.m_half_open
 				, boost::bind(&torrent::on_torrent_download, shared_from_this()
 					, _1, _2, _3, _4)
 				, true // bottled
@@ -858,7 +862,7 @@
 		for (std::vector<announce_entry>::const_iterator i = m_trackers.begin()
 			, end(m_trackers.end()); i != end; ++i)
 			if (i->verified) ++verified_trackers;
-			
+
 		return verified_trackers == 0;
 	}
 
@@ -878,7 +882,7 @@
 		// is being destructed, all weak references to it have been
 		// reset, which means that all its peers already have an
 		// invalidated torrent pointer (so it cannot be verified to be correct)
-		
+
 		// i.e. the invariant can only be maintained if all connections have
 		// been closed by the time the torrent is destructed. And they are
 		// supposed to be closed. So we can still do the invariant check.
@@ -1192,7 +1196,7 @@
 
 		picker().mark_as_finished(block_finished, 0);
 	}
-	
+
 	void torrent::on_disk_cache_complete(int ret, disk_io_job const& j)
 	{
 		// suggest this piece to all peers
@@ -1242,7 +1246,7 @@
 		if (!tp) return;
 
 		add_extension(tp);
-		
+
 		for (peer_iterator i = m_connections.begin();
 			i != m_connections.end(); ++i)
 		{
@@ -1537,7 +1541,7 @@
 			int ev = 0;
 			if (m_resume_entry.dict_find_string_value("file-format") != "libtorrent resume file")
 				ev = errors::invalid_file_tag;
-	
+
 			std::string info_hash = m_resume_entry.dict_find_string_value("info-hash");
 			if (!ev && info_hash.empty())
 				ev = errors::missing_info_hash;
@@ -1579,10 +1583,6 @@
 			std::fill(m_file_priority.begin(), m_file_priority.end(), 0);
 		}
 
-		// in case file priorities were passed in via the add_torrent_params
-		// and also in the case of share mode, we need to update the priorities
-		update_piece_priorities();
-
 		if (!m_seed_mode)
 		{
 			TORRENT_ASSERT(!m_picker);
@@ -1610,6 +1610,19 @@
 			}
 		}
 
+		// in case file priorities were passed in via the add_torrent_params
+		// and also in the case of share mode, we need to update the priorities
+		//
+		// THIS MUST BE DONE AFTER WE CREATE THE PIECE PICKER.
+		// The piece picker is the one that keeps track of piece priorities, and
+		// until we have the piece picker, we will be considered a seed, which
+		// screws with update_piece_priorities()
+		if (!m_file_priority.empty() && std::find(m_file_priority.begin()
+				, m_file_priority.end(), 0) != m_file_priority.end())
+		{
+			update_piece_priorities();
+		}
+
 		if (!m_connections_initialized)
 		{
 			m_connections_initialized = true;
@@ -1627,9 +1640,6 @@
 			}
 		}
 
-		std::vector<web_seed_entry> const& web_seeds = m_torrent_file->web_seeds();
-		m_web_seeds.insert(m_web_seeds.end(), web_seeds.begin(), web_seeds.end());
-
 #if TORRENT_USE_ASSERTS
 		m_resume_data_loaded = true;
 #endif
@@ -2103,6 +2113,12 @@
 		if (ret == piece_manager::need_full_check) return;
 
 		dequeue_torrent_check();
+		if (m_auto_managed)
+		{
+			// if we're auto managed. assume we need to be paused until the auto
+			// managed logic runs again
+			pause();
+		}
 		files_checked();
 	}
 
@@ -2149,7 +2165,7 @@
 	void torrent::on_tracker_announce()
 	{
 		TORRENT_ASSERT(m_ses.is_network_thread());
-		m_waiting_tracker = false;	
+		m_waiting_tracker = false;
 		if (m_abort) return;
 		announce_with_tracker();
 	}
@@ -2366,7 +2382,7 @@
 				if (ae.is_working()) sent_announce = true;
 				continue;
 			}
-			
+
 			req.url = ae.url;
 			req.event = e;
 			if (req.event == tracker_request::none)
@@ -2385,7 +2401,7 @@
 				// a warning if there isn't one
 				std::string protocol = req.url.substr(0, req.url.find(':'));
 				int proxy_type = m_ses.m_proxy.type;
-	
+
 				// http can run over any proxy, so as long as one is used
 				// it's OK. If no proxy is configured, skip this tracker
 				if ((protocol == "http" || protocol == "https")
@@ -2467,7 +2483,7 @@
 
 		int i = m_last_working_tracker;
 		if (i == -1) i = 0;
-		
+
 		tracker_request req;
 		req.apply_ip_filter = m_apply_ip_filter && m_ses.m_settings.apply_ip_filter_to_trackers;
 		req.info_hash = m_torrent_file->info_hash();
@@ -2487,15 +2503,15 @@
 		if (m_ses.m_alerts.should_post<tracker_warning_alert>())
 			m_ses.m_alerts.post_alert(tracker_warning_alert(get_handle(), req.url, msg));
 	}
-	
+
  	void torrent::tracker_scrape_response(tracker_request const& req
  		, int complete, int incomplete, int downloaded, int downloaders)
  	{
 		TORRENT_ASSERT(m_ses.is_network_thread());
- 
+
  		INVARIANT_CHECK;
 		TORRENT_ASSERT(req.kind == tracker_request::scrape_request);
- 
+
 		announce_entry* ae = find_tracker(req);
 		if (ae)
 		{
@@ -2537,7 +2553,7 @@
 		m_incomplete = incomplete;
 		m_downloaded = downloaded;
 	}
- 
+
 	void torrent::tracker_response(
 		tracker_request const& r
 		, address const& tracker_ip // this is the IP we connected to
@@ -2547,7 +2563,7 @@
 		, int min_interval
 		, int complete
 		, int incomplete
-		, int downloaded 
+		, int downloaded
 		, address const& external_ip
 		, const std::string& trackerid)
 	{
@@ -2689,13 +2705,11 @@
 		// do it if the bind IP for the tracker request that just completed
 		// matches one of the listen interfaces, since that means this
 		// announce was the second one
-		// don't connect twice just to tell it we're stopping
 
 		if (((!is_any(m_ses.m_ipv6_interface.address()) && tracker_ip.is_v4())
 			|| (!is_any(m_ses.m_ipv4_interface.address()) && tracker_ip.is_v6()))
 			&& r.bind_ip != m_ses.m_ipv4_interface.address()
-			&& r.bind_ip != m_ses.m_ipv6_interface.address()
-			&& r.event != tracker_request::stopped)
+			&& r.bind_ip != m_ses.m_ipv6_interface.address())
 		{
 			std::list<address>::const_iterator i = std::find_if(tracker_ips.begin()
 				, tracker_ips.end(), boost::bind(&address::is_v4, _1) != tracker_ip.is_v4());
@@ -2704,15 +2718,24 @@
 				// the tracker did resolve to a different type of address, so announce
 				// to that as well
 
+				// TODO 2: there's a bug when removing a torrent or shutting down the session,
+				// where the second announce is skipped (in this case, the one to the IPv6
+				// name). This should be fixed by generalizing the tracker list structure to
+				// separate the IPv6 and IPv4 addresses as conceptually separate trackers,
+				// and they should be announced to in parallel
+
+				tracker_request req = r;
+
 				// tell the tracker to bind to the opposite protocol type
-				address bind_interface = tracker_ip.is_v4()
-					?m_ses.m_ipv6_interface.address()
-					:m_ses.m_ipv4_interface.address();
-				announce_with_tracker(r.event, bind_interface);
+				req.bind_ip = tracker_ip.is_v4()
+					? m_ses.m_ipv6_interface.address()
+					: m_ses.m_ipv4_interface.address();
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
 				debug_log("announce again using %s as the bind interface"
-					, print_address(bind_interface).c_str());
+					, print_address(req.bind_ip).c_str());
 #endif
+				m_ses.m_tracker_manager.queue_request(m_ses.m_io_service, m_ses.m_half_open, req
+					, tracker_login() , shared_from_this());
 			}
 		}
 
@@ -2827,7 +2850,7 @@
 					, host->endpoint().address(), peer_blocked_alert::ip_filter));
 			return;
 		}
-			
+
 		m_policy.add_peer(*host, pid, peer_info::tracker, 0);
 	}
 
@@ -2932,7 +2955,7 @@
 		st.total_wanted_done = size_type(num_have() - m_picker->num_have_filtered())
 			* piece_size;
 		TORRENT_ASSERT(st.total_wanted_done >= 0);
-		
+
 		st.total_done = size_type(num_have()) * piece_size;
 		TORRENT_ASSERT(num_have() < m_torrent_file->num_pieces());
 
@@ -2945,7 +2968,7 @@
 			--num_filtered_pieces;
 		}
 		st.total_wanted -= size_type(num_filtered_pieces) * piece_size;
-	
+
 		// if we have the last piece, we have to correct
 		// the amount we have, since the first calculation
 		// assumed all pieces were of equal size
@@ -3111,7 +3134,7 @@
 				}
 				fputs("\n", stderr);
 			}
-			
+
 			fputs("downloading pieces:\n", stderr);
 
 			for (std::map<piece_block, int>::iterator i = downloading_piece.begin();
@@ -3592,7 +3615,7 @@
 
 		// post a message to the main thread to destruct
 		// the torrent object from there
-		if (m_owning_storage.get())
+		if (m_owning_storage)
 		{
 			m_storage->abort_disk_io();
 			m_storage->async_release_files(
@@ -3604,7 +3627,7 @@
 			if (alerts().should_post<cache_flushed_alert>())
 				alerts().post_alert(cache_flushed_alert(get_handle()));
 		}
-		
+
 		dequeue_torrent_check();
 
 		if (m_state == torrent_status::checking_files)
@@ -3635,7 +3658,7 @@
 		// the bitfield and that is not currently being super
 		// seeded by any peer
 		TORRENT_ASSERT(m_super_seeding);
-		
+
 		// do a linear search from the first piece
 		int min_availability = 9999;
 		std::vector<int> avail_vec;
@@ -3719,7 +3742,7 @@
 	void torrent::on_file_renamed(int ret, disk_io_job const& j)
 	{
 		TORRENT_ASSERT(m_ses.is_network_thread());
-		
+
 		if (ret == 0)
 		{
 			if (alerts().should_post<file_renamed_alert>())
@@ -3913,7 +3936,7 @@
 					// update the average download time and average
 					// download time deviation
 					int dl_time = total_milliseconds(time_now() - i->first_requested);
-   
+
 					if (m_average_piece_time == 0)
 					{
 						m_average_piece_time = dl_time;
@@ -3923,7 +3946,7 @@
 						int diff = abs(int(dl_time - m_average_piece_time));
 						if (m_piece_time_deviation == 0) m_piece_time_deviation = diff;
 						else m_piece_time_deviation = (m_piece_time_deviation * 9 + diff) / 10;
-   
+
 						m_average_piece_time = (m_average_piece_time * 9 + dl_time) / 10;
 					}
 				}
@@ -4293,7 +4316,7 @@
 		// this call is only valid on torrents with metadata
 		TORRENT_ASSERT(valid_metadata());
 		if (is_seed()) return false;
-		
+
 		TORRENT_ASSERT(m_picker.get());
 		TORRENT_ASSERT(index >= 0);
 		TORRENT_ASSERT(index < m_torrent_file->num_pieces());
@@ -4332,7 +4355,7 @@
 		TORRENT_ASSERT((int)bitmask.size() == m_torrent_file->num_files());
 
 		if (int(bitmask.size()) != m_torrent_file->num_files()) return;
-		
+
 		size_type position = 0;
 
 		if (m_torrent_file->num_pieces())
@@ -4347,7 +4370,7 @@
 				position += m_torrent_file->files().file_size(i);
 				// is the file selected for download?
 				if (!bitmask[i])
-				{           
+				{
 					// mark all pieces of the file as downloadable
 					int start_piece = int(start / piece_length);
 					int last_piece = int(position / piece_length);
@@ -4421,7 +4444,7 @@
 	{
 		std::vector<announce_entry>::iterator k = std::find_if(m_trackers.begin()
 			, m_trackers.end(), boost::bind(&announce_entry::url, _1) == url.url);
-		if (k != m_trackers.end()) 
+		if (k != m_trackers.end())
 		{
 			k->source |= url.source;
 			return false;
@@ -4447,7 +4470,7 @@
 		state_updated();
 		return true;
 	}
-	
+
 	bool torrent::unchoke_peer(peer_connection& c, bool optimistic)
 	{
 		INVARIANT_CHECK;
@@ -4586,6 +4609,7 @@
 			return;
 		}
 
+		policy::peer* pp = p->peer_info_struct();
 		if (ready_for_connections())
 		{
 			TORRENT_ASSERT(p->associated_torrent().lock().get() == NULL
@@ -4595,7 +4619,7 @@
 			{
 				if (m_picker.get())
 				{
-					m_picker->dec_refcount_all(p);
+					m_picker->dec_refcount_all(pp);
 				}
 			}
 			else
@@ -4604,7 +4628,7 @@
 				{
 					bitfield const& pieces = p->get_bitfield();
 					TORRENT_ASSERT(pieces.count() <= int(pieces.size()));
-					m_picker->dec_refcount(pieces, p);
+					m_picker->dec_refcount(pieces, pp);
 				}
 			}
 		}
@@ -4615,7 +4639,6 @@
 			m_ses.m_unchoke_time_scaler = 0;
 		}
 
-		policy::peer* pp = p->peer_info_struct();
 		if (pp)
 		{
 			if (pp->optimistically_unchoked)
@@ -4710,7 +4733,7 @@
 			remove_web_seed(web);
 			return;
 		}
-		
+
 #ifdef TORRENT_USE_OPENSSL
 		if (protocol != "http" && protocol != "https")
 #else
@@ -4774,8 +4797,9 @@
 #endif
 
 		proxy_settings const& ps = m_ses.proxy();
-		if (ps.type == proxy_settings::http
+		if ((ps.type == proxy_settings::http
 			|| ps.type == proxy_settings::http_pw)
+			&& ps.proxy_peer_connections)
 		{
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING
 			debug_log("resolving proxy for web seed: %s", web->url.c_str());
@@ -4789,7 +4813,8 @@
 		}
 		else if (ps.proxy_hostnames
 			&& (ps.type == proxy_settings::socks5
-				|| ps.type == proxy_settings::socks5_pw))
+				|| ps.type == proxy_settings::socks5_pw)
+			&& ps.proxy_peer_connections)
 		{
 			connect_web_seed(web, tcp::endpoint(address(), port));
 		}
@@ -4960,7 +4985,7 @@
 					, a.address(), peer_blocked_alert::ip_filter));
 			return;
 		}
-		
+
 		TORRENT_ASSERT(web->resolving == false);
 		TORRENT_ASSERT(web->peer_info.connection == 0);
 
@@ -4976,21 +5001,22 @@
 
 		boost::shared_ptr<socket_type> s(new (std::nothrow) socket_type(m_ses.m_io_service));
 		if (!s) return;
-	
+
 		void* userdata = 0;
 #ifdef TORRENT_USE_OPENSSL
-		bool ssl = string_begins_no_case("https://", web->url.c_str());
+		const bool ssl = string_begins_no_case("https://", web->url.c_str());
 		if (ssl)
 		{
 			userdata = m_ssl_ctx.get();
 			if (!userdata) userdata = &m_ses.m_ssl_ctx;
 		}
 #endif
-		bool ret = instantiate_connection(m_ses.m_io_service, m_ses.proxy(), *s, userdata, 0, true);
+		proxy_settings const& ps = m_ses.proxy();
+		bool ret = instantiate_connection(m_ses.m_io_service, ps
+			, *s, userdata, 0, true);
 		(void)ret;
 		TORRENT_ASSERT(ret);
 
-		proxy_settings const& ps = m_ses.proxy();
 		if (s->get<http_stream>())
 		{
 			// the web seed connection will talk immediately to
@@ -5011,8 +5037,11 @@
 		}
 
 		if (ps.proxy_hostnames
-			&& (ps.type == proxy_settings::socks5
-				|| ps.type == proxy_settings::socks5_pw))
+			&& (s->get<socks5_stream>()
+#ifdef TORRENT_USE_OPENSSL
+				|| s->get<ssl_stream<socks5_stream> >()
+#endif
+				))
 		{
 			// we're using a socks proxy and we're resolving
 			// hostnames through it
@@ -5021,7 +5050,7 @@
 				ssl ? &s->get<ssl_stream<socks5_stream> >()->next_layer() :
 #endif
 				s->get<socks5_stream>();
-			TORRENT_ASSERT(str);
+			TORRENT_ASSERT_VAL(str, s->type_name());
 
 			str->set_dst_name(hostname);
 		}
@@ -5078,7 +5107,7 @@
 				, size_type(web->peer_info.prev_amount_upload) << 10);
 			web->peer_info.prev_amount_download = 0;
 			web->peer_info.prev_amount_upload = 0;
-#if defined TORRENT_VERBOSE_LOGGING 
+#if defined TORRENT_VERBOSE_LOGGING
 			debug_log("web seed connection started: %s", web->url.c_str());
 #endif
 
@@ -5110,7 +5139,7 @@
 			return (a >> 24) | ((a & 0xff0000) >> 8) | ((a & 0xff00) << 8) | ((a & 0xff) << 24);
 		}
 	}
-	
+
 	void torrent::resolve_peer_country(boost::intrusive_ptr<peer_connection> const& p) const
 	{
 		TORRENT_ASSERT(m_ses.is_network_thread());
@@ -5150,7 +5179,7 @@
 		TORRENT_ASSERT(m_ses.is_network_thread());
 
 		INVARIANT_CHECK;
-		
+
 		m_resolving_country = false;
 
 		if (m_abort) return;
@@ -5222,7 +5251,7 @@
 		{
 			// country is an ISO 3166 country code
 			int country = i->endpoint().address().to_v4().to_ulong() & 0xffff;
-			
+
 			// look up the country code in the map
 			const int size = sizeof(country_map)/sizeof(country_map[0]);
 			country_entry tmp = {country, ""};
@@ -5240,7 +5269,7 @@
 #endif
 				return;
 			}
-			
+
 			p->set_country(j->name);
 		}
 	}
@@ -5257,7 +5286,10 @@
 		m_complete = rd.dict_find_int_value("num_complete", 0xffffff);
 		m_incomplete = rd.dict_find_int_value("num_incomplete", 0xffffff);
 		m_downloaded = rd.dict_find_int_value("num_downloaded", 0xffffff);
-
+		int priorityValue = rd.dict_find_int_value("priority");
+		if (priorityValue >=0 && priorityValue < 256)
+			m_priority = priorityValue;
+			
 		if (!m_override_resume_data)
 		{
 			int up_limit_ = rd.dict_find_int_value("upload_rate_limit", -1);
@@ -5362,10 +5394,11 @@
 		if (!m_override_resume_data)
 		{
 			lazy_entry const* file_priority = rd.dict_find_list("file_priority");
-			if (file_priority && file_priority->list_size()
-				== m_torrent_file->num_files())
+			if (file_priority)
 			{
-				for (int i = 0; i < file_priority->list_size(); ++i)
+				const int num_files = (std::min)(file_priority->list_size()
+					, m_torrent_file->num_files());
+				for (int i = 0; i < num_files; ++i)
 				{
 					m_file_priority[i] = file_priority->list_int_value_at(i, 1);
 					// this is suspicious, leave seed mode
@@ -5404,7 +5437,17 @@
 				prioritize_udp_trackers();
 		}
 
+		// if merge resume http seeds is not set, we need to clear whatever web
+		// seeds we loaded from the .torrent file, because we want whatever's in
+		// the resume file to take precedence. If there aren't even any fields in
+		// the resume data though, keep the ones from the torrent
 		lazy_entry const* url_list = rd.dict_find_list("url-list");
+		lazy_entry const* httpseeds = rd.dict_find_list("httpseeds");
+		if ((url_list || httpseeds) && !m_merge_resume_http_seeds)
+		{
+			m_web_seeds.clear();
+		}
+
 		if (url_list)
 		{
 			for (int i = 0; i < url_list->list_size(); ++i)
@@ -5416,7 +5459,6 @@
 			}
 		}
 
-		lazy_entry const* httpseeds = rd.dict_find_list("httpseeds");
 		if (httpseeds)
 		{
 			for (int i = 0; i < httpseeds->list_size(); ++i)
@@ -5532,7 +5574,7 @@
 		if (!m_url.empty()) ret["url"] = m_url;
 		if (!m_uuid.empty()) ret["uuid"] = m_uuid;
 		if (!m_source_feed_url.empty()) ret["feed"] = m_source_feed_url;
-		
+
 		const sha1_hash& info_hash = torrent_file().info_hash();
 		ret["info-hash"] = std::string((char*)info_hash.begin(), (char*)info_hash.end());
 
@@ -5763,7 +5805,8 @@
 		ret["announce_to_trackers"] = m_announce_to_trackers;
 		ret["announce_to_lsd"] = m_announce_to_lsd;
 		ret["auto_managed"] = m_auto_managed;
-
+		ret["priority"] = m_priority;
+		
 		// write piece priorities
 		entry::string_type& piece_priority = ret["piece_priority"].string();
 		piece_priority.resize(m_torrent_file->num_pieces());
@@ -5820,7 +5863,7 @@
 
 			v.push_back(peer_info());
 			peer_info& p = v.back();
-			
+
 			peer->get_peer_info(p);
 #ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
 			if (resolving_countries())
@@ -5912,9 +5955,9 @@
 			pi.piece_index = i->index;
 			queue->push_back(pi);
 		}
-	
+
 	}
-	
+
 	bool torrent::connect_to_peer(policy::peer* peerinfo, bool ignore_limit)
 	{
 		TORRENT_ASSERT(m_ses.is_network_thread());
@@ -6473,7 +6516,7 @@
 
 		lhs_transferred /= lhs_time_connected + 1;
 		rhs_transferred /= (rhs_time_connected + 1);
-		if (lhs_transferred != rhs_transferred)	
+		if (lhs_transferred != rhs_transferred)
 			return lhs_transferred < rhs_transferred;
 
 		// prefer to disconnect peers that chokes us
@@ -6571,11 +6614,13 @@
 
 		m_policy.recalculate_connect_candidates();
 
-		TORRENT_ASSERT(m_storage);
-		// we need to keep the object alive during this operation
-		m_storage->async_release_files(
-			boost::bind(&torrent::on_files_released, shared_from_this(), _1, _2));
-		
+		if (m_storage)
+		{
+			// we need to keep the object alive during this operation
+			m_storage->async_release_files(
+				boost::bind(&torrent::on_files_released, shared_from_this(), _1, _2));
+		}
+
 		// this torrent just completed downloads, which means it will fall
 		// under a different limit with the auto-manager. Make sure we
 		// update auto-manage torrents in that case
@@ -6584,11 +6629,11 @@
 	}
 
 	// this is called when we were finished, but some files were
-	// marked for downloading, and we are no longer finished	
+	// marked for downloading, and we are no longer finished
 	void torrent::resume_download()
 	{
 		INVARIANT_CHECK;
-	
+
 		if (m_state == torrent_status::checking_resume_data
 			|| m_state == torrent_status::checking_files
 			|| m_state == torrent_status::allocating)
@@ -6707,7 +6752,7 @@
 			m_ses.m_alerts.post_alert(torrent_checked_alert(
 				get_handle()));
 		}
-		
+
 		// calling pause will also trigger the auto managed
 		// recalculation
 		// if we just got here by downloading the metadata,
@@ -6725,10 +6770,6 @@
 			// turn off super seeding if we're not a seed
 			if (m_super_seeding) m_super_seeding = false;
 
-			// if we just finished checking and we're not a seed, we are
-			// likely to be unpaused
-			m_ses.trigger_auto_manage();
-
 			if (is_finished() && m_state != torrent_status::finished)
 				finished();
 		}
@@ -6914,10 +6955,11 @@
 		TORRENT_ASSERT(m_ses.is_network_thread());
 		if (is_paused()) TORRENT_ASSERT(num_peers() == 0 || m_graceful_pause_mode);
 
-		if (!should_check_files())
-			TORRENT_ASSERT(m_state != torrent_status::checking_files);
-		else
-			TORRENT_ASSERT(m_queued_for_checking);
+// this fails in some transitions
+//		if (!should_check_files())
+//			TORRENT_ASSERT(m_state != torrent_status::checking_files);
+//		else
+//			TORRENT_ASSERT(m_queued_for_checking);
 
 		if (m_torrent_file)
 		{
@@ -7064,7 +7106,7 @@
 				TORRENT_ASSERT(complete);
 			}
 		}
-*/			
+*/
 		if (m_files_checked && valid_metadata())
 		{
 			TORRENT_ASSERT(block_size() > 0);
@@ -7156,7 +7198,7 @@
 			{
 				torrent* t = i->second.get();
 				if (t == this) continue;
-				if (t->m_sequence_number >= p 
+				if (t->m_sequence_number >= p
 					&& t->m_sequence_number < m_sequence_number
 					&& t->m_sequence_number != -1)
 				{
@@ -7488,12 +7530,12 @@
 		return ret;
 	}
 
-	// this is an async operation triggered by the client	
+	// this is an async operation triggered by the client
 	void torrent::save_resume_data(int flags)
 	{
 		TORRENT_ASSERT(m_ses.is_network_thread());
 		INVARIANT_CHECK;
-	
+
 		if (!valid_metadata())
 		{
 			alerts().post_alert(save_resume_data_failed_alert(get_handle()
@@ -7532,7 +7574,7 @@
 		m_storage->async_save_resume_data(
 			boost::bind(&torrent::on_save_resume_data, shared_from_this(), _1, _2));
 	}
-	
+
 	bool torrent::should_check_files() const
 	{
 		TORRENT_ASSERT(m_ses.is_network_thread());
@@ -7731,13 +7773,25 @@
 		if (std::find(m_web_seeds.begin(), m_web_seeds.end(), ent) != m_web_seeds.end()) return;
 		m_web_seeds.push_back(ent);
 	}
-	
+
 	void torrent::set_allow_peers(bool b, bool graceful)
 	{
 		TORRENT_ASSERT(m_ses.is_network_thread());
 
-		if (m_allow_peers == b
-			&& m_graceful_pause_mode == graceful) return;
+		if (m_allow_peers == b)
+		{
+			// there is one special case here. If we are
+			// currently in graceful pause mode, and we just turned into regular
+			// paused mode, we need to actually pause the torrent properly
+			if (m_allow_peers == true
+				&& m_graceful_pause_mode == true
+				&& graceful == false)
+			{
+				m_graceful_pause_mode = graceful;
+				do_pause();
+			}
+			return;
+		}
 
 		m_allow_peers = b;
 		if (!m_ses.is_paused())
@@ -8105,7 +8159,7 @@
 		// ---- WEB SEEDS ----
 
 		maybe_connect_web_seeds();
-		
+
 		m_swarm_last_seen_complete = m_last_seen_complete;
 		for (peer_iterator i = m_connections.begin();
 			i != m_connections.end();)
@@ -8282,7 +8336,7 @@
 		missing_pieces -= 2 * num_seeds;
 
 		if (missing_pieces <= 0) return;
-		
+
 		// missing_pieces represents our opportunity to download pieces
 		// and share them more than once each
 
@@ -8629,7 +8683,7 @@
 			if (pi.info[k].num_peers > timed_out)
 				continue;
 
-			busy_blocks[busy_count].peers = pi.info[k].num_peers; 
+			busy_blocks[busy_count].peers = pi.info[k].num_peers;
 			busy_blocks[busy_count].index = k;
 			++busy_count;
 
@@ -9164,7 +9218,7 @@
 	{
 		fp.clear();
 		if (!valid_metadata()) return;
-	
+
 		fp.resize(m_torrent_file->num_files(), 1.f);
 		if (is_seed()) return;
 
@@ -9186,7 +9240,7 @@
 			fp.clear();
 			return;
 		}
-	
+
 		fp.resize(m_torrent_file->num_files(), 0);
 
 		// if we're a seed, just fill in the full file sizes as a shortcut
@@ -9201,7 +9255,7 @@
 		// have any piece yet.
 		if (!has_picker())
 			return;
-		
+
 		if (flags & torrent_handle::piece_granularity)
 		{
 			std::copy(m_file_progress.begin(), m_file_progress.end(), fp.begin());
@@ -9329,7 +9383,7 @@
 			}
 		}
 	}
-	
+
 	void torrent::new_external_ip()
 	{
 		m_policy.clear_peer_prio();
@@ -9413,7 +9467,7 @@
 
 	void torrent::state_updated()
 	{
-		// if this fails, this function is probably called 
+		// if this fails, this function is probably called
 		// from within the torrent constructor, which it
 		// shouldn't be. Whichever function ends up calling
 		// this should probably be moved to torrent::start()
@@ -9731,9 +9785,9 @@
 	{
 		if (!m_ses.m_logger) return;
 
-		va_list v;	
+		va_list v;
 		va_start(v, fmt);
-	
+
 		char usr[1024];
 		vsnprintf(usr, sizeof(usr), fmt, v);
 		va_end(v);
diff -Nru libtorrent-rasterbar-1.0.6/src/torrent_info.cpp libtorrent-rasterbar-1.0.7/src/torrent_info.cpp
--- libtorrent-rasterbar-1.0.6/src/torrent_info.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/torrent_info.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -812,7 +812,7 @@
 		if (ret < 0) return;
 
 		lazy_entry e;
-		if (buf.size() == 0 || lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0)
+		if (lazy_bdecode(&buf[0], &buf[0] + buf.size(), e, ec) != 0)
 			return;
 		parse_torrent_file(e, ec, flags);
 
@@ -933,6 +933,13 @@
 		h.update(section.first, section.second);
 		m_info_hash = h.final();
 
+		// the internal metadata size is only 24 bits
+		if (section.second >= (2<<24))
+		{
+			ec = errors::metadata_too_large;
+			return false;
+		}
+
 		// copy the info section
 		m_info_section_size = section.second;
 		m_info_section.reset(new char[m_info_section_size]);
diff -Nru libtorrent-rasterbar-1.0.6/src/udp_socket.cpp libtorrent-rasterbar-1.0.7/src/udp_socket.cpp
--- libtorrent-rasterbar-1.0.6/src/udp_socket.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/udp_socket.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -1035,6 +1035,13 @@
 
 	if (e)
 	{
+		// we failed to connect to the proxy, if we don't have force_proxy set,
+		// drain the queue over the UDP socket
+		if (!m_force_proxy)
+		{
+			drain_queue();
+		}
+
 		call_handler(e, udp::endpoint(), 0, 0);
 		return;
 	}
diff -Nru libtorrent-rasterbar-1.0.6/src/utf8.cpp libtorrent-rasterbar-1.0.7/src/utf8.cpp
--- libtorrent-rasterbar-1.0.6/src/utf8.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/utf8.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -31,13 +31,15 @@
 */
 
 #include "libtorrent/config.hpp"
-#include "libtorrent/utf8.hpp"
-#include "libtorrent/ConvertUTF.h"
 
 // on windows we need these functions for
 // convert_to_native and convert_from_native
 #if TORRENT_USE_WSTRING || defined TORRENT_WINDOWS
 
+#include <iterator>
+#include "libtorrent/utf8.hpp"
+#include "libtorrent/ConvertUTF.h"
+
 namespace libtorrent
 {
 	utf8_conv_result_t utf8_wchar(const std::string &utf8, std::wstring &wide)
diff -Nru libtorrent-rasterbar-1.0.6/src/utp_stream.cpp libtorrent-rasterbar-1.0.7/src/utp_stream.cpp
--- libtorrent-rasterbar-1.0.6/src/utp_stream.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/utp_stream.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -3374,7 +3374,8 @@
 		// a socket that has not been confirmed to actually have a live remote end
 		// (the IP may have been spoofed) fail on the first timeout. If we had
 		// heard anything from this peer, it would have been confirmed.
-		if (m_num_timeouts > m_sm->num_resends() || !m_confirmed)
+		if (m_num_timeouts > m_sm->num_resends()
+			|| (m_num_timeouts > 0 && !m_confirmed))
 		{
 			// the connection is dead
 			m_error = asio::error::timed_out;
diff -Nru libtorrent-rasterbar-1.0.6/src/version.cpp libtorrent-rasterbar-1.0.7/src/version.cpp
--- libtorrent-rasterbar-1.0.6/src/version.cpp	1970-01-01 00:00:00.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/version.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+
+Copyright (c) 2015, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "libtorrent/version.hpp"
+
+namespace libtorrent {
+
+char const* version()
+{
+	return LIBTORRENT_VERSION;
+}
+
+}
+
diff -Nru libtorrent-rasterbar-1.0.6/src/web_connection_base.cpp libtorrent-rasterbar-1.0.7/src/web_connection_base.cpp
--- libtorrent-rasterbar-1.0.6/src/web_connection_base.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/src/web_connection_base.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -69,9 +69,11 @@
 	{
 		INVARIANT_CHECK;
 
+		TORRENT_ASSERT(is_outgoing());
+
 		// we only want left-over bandwidth
 		set_priority(1);
-		
+
 		// since this is a web seed, change the timeout
 		// according to the settings.
 		set_timeout(ses.settings().urlseed_timeout);
diff -Nru libtorrent-rasterbar-1.0.6/test/Jamfile libtorrent-rasterbar-1.0.7/test/Jamfile
--- libtorrent-rasterbar-1.0.6/test/Jamfile	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/Jamfile	2015-11-14 05:21:45.000000000 +0000
@@ -132,6 +132,7 @@
 	[ run test_web_seed_redirect.cpp ]
 	[ run test_web_seed_socks4.cpp ]
 	[ run test_web_seed_socks5.cpp ]
+	[ run test_web_seed_socks5_no_peers.cpp ]
 	[ run test_web_seed_socks5_pw.cpp ]
 	[ run test_web_seed_http.cpp ]
 	[ run test_web_seed_http_pw.cpp ]
@@ -153,3 +154,64 @@
 	[ run test_pex.cpp ]
 	; 
 
+alias ci-tests :
+
+	test_ip_voter
+	test_resume
+	test_sliding_average
+	test_socket_io
+	test_utf8
+	test_gzip
+	test_bitfield
+	test_torrent_info
+	test_time
+	test_file_storage
+	test_peer_priority
+	test_file
+	test_threads
+	test_rss
+	test_bandwidth_limiter
+	test_buffer
+	test_piece_picker
+	test_bencoding
+	test_fast_extension
+	test_primitives
+	test_http_parser
+	test_packet_buffer
+	test_string
+	test_magnet
+	test_xml
+	test_ip_filter
+	test_hasher
+	test_dht
+	test_storage
+	test_torrent_parse
+	test_session
+	test_upnp
+	test_read_piece
+
+	test_tracker
+	test_checking
+	test_web_seed
+	test_web_seed_redirect
+	test_web_seed_socks4
+	test_web_seed_socks5
+	test_web_seed_socks5_no_peers
+	test_web_seed_socks5_pw
+	test_web_seed_chunked
+	test_web_seed_ban
+	test_bdecode_performance
+	test_pe_crypto
+
+	test_remap_files
+	test_utp
+	test_auto_unchoke
+	test_http_connection
+	test_torrent
+	test_metadata_extension
+	test_trackers_extension
+	test_swarm
+	test_lsd
+	test_pex
+	;
+
diff -Nru libtorrent-rasterbar-1.0.6/test/Makefile.am libtorrent-rasterbar-1.0.7/test/Makefile.am
--- libtorrent-rasterbar-1.0.6/test/Makefile.am	2015-07-30 04:11:00.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/Makefile.am	2015-11-14 05:33:41.000000000 +0000
@@ -29,7 +29,6 @@
   test_primitives            \
   test_http_parser           \
   test_magnet                \
-  test_natpmp                \
   test_packet_buffer         \
   test_read_piece            \
   test_resume                \
@@ -57,6 +56,7 @@
   test_web_seed_redirect     \
   test_web_seed_socks4       \
   test_web_seed_socks5       \
+  test_web_seed_socks5_no_peers \
   test_web_seed_socks5_pw    \
   test_url_seed              \
   test_remap_files           \
@@ -121,7 +121,8 @@
   pb.xml \
   upnp.xml \
   zeroes.gz \
-  utf8_test.txt
+  utf8_test.txt \
+  test_natpmp.cpp
 
 EXTRA_PROGRAMS = $(test_programs)
 
@@ -163,7 +164,6 @@
 test_primitives_SOURCES = test_primitives.cpp
 test_http_parser_SOURCES = test_http_parser.cpp
 test_magnet_SOURCES = test_magnet.cpp
-test_natpmp_SOURCES = test_natpmp.cpp
 test_packet_buffer_SOURCES = test_packet_buffer.cpp
 test_read_piece_SOURCES = test_read_piece.cpp
 test_storage_SOURCES = test_storage.cpp
@@ -191,6 +191,7 @@
 test_web_seed_redirect_SOURCES = test_web_seed_redirect.cpp
 test_web_seed_socks4_SOURCES = test_web_seed_socks4.cpp
 test_web_seed_socks5_SOURCES = test_web_seed_socks5.cpp
+test_web_seed_socks5_no_peers_SOURCES = test_web_seed_socks5_no_peers.cpp
 test_web_seed_socks5_pw_SOURCES = test_web_seed_socks5_pw.cpp
 test_url_seed_SOURCES = test_url_seed.cpp
 test_remap_files_SOURCES = test_remap_files.cpp
diff -Nru libtorrent-rasterbar-1.0.6/test/Makefile.in libtorrent-rasterbar-1.0.7/test/Makefile.in
--- libtorrent-rasterbar-1.0.6/test/Makefile.in	2015-07-30 04:11:48.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/Makefile.in	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -83,9 +93,6 @@
 @ENABLE_TESTS_TRUE@check_PROGRAMS = $(am__EXEEXT_1)
 EXTRA_PROGRAMS = $(am__EXEEXT_1)
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) \
-	$(top_srcdir)/build-aux/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
 	$(top_srcdir)/m4/ax_boost_python.m4 \
@@ -101,6 +108,8 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -128,21 +137,22 @@
 	test_piece_picker$(EXEEXT) test_xml$(EXEEXT) \
 	test_string$(EXEEXT) test_primitives$(EXEEXT) \
 	test_http_parser$(EXEEXT) test_magnet$(EXEEXT) \
-	test_natpmp$(EXEEXT) test_packet_buffer$(EXEEXT) \
-	test_read_piece$(EXEEXT) test_resume$(EXEEXT) \
-	test_rss$(EXEEXT) test_ssl$(EXEEXT) test_storage$(EXEEXT) \
-	test_swarm$(EXEEXT) test_time$(EXEEXT) test_threads$(EXEEXT) \
-	test_torrent$(EXEEXT) test_torrent_info$(EXEEXT) \
-	test_torrent_parse$(EXEEXT) test_tracker$(EXEEXT) \
-	test_trackers_extension$(EXEEXT) test_transfer$(EXEEXT) \
-	test_upnp$(EXEEXT) enum_if$(EXEEXT) test_utp$(EXEEXT) \
-	test_session$(EXEEXT) test_web_seed$(EXEEXT) \
+	test_packet_buffer$(EXEEXT) test_read_piece$(EXEEXT) \
+	test_resume$(EXEEXT) test_rss$(EXEEXT) test_ssl$(EXEEXT) \
+	test_storage$(EXEEXT) test_swarm$(EXEEXT) test_time$(EXEEXT) \
+	test_threads$(EXEEXT) test_torrent$(EXEEXT) \
+	test_torrent_info$(EXEEXT) test_torrent_parse$(EXEEXT) \
+	test_tracker$(EXEEXT) test_trackers_extension$(EXEEXT) \
+	test_transfer$(EXEEXT) test_upnp$(EXEEXT) enum_if$(EXEEXT) \
+	test_utp$(EXEEXT) test_session$(EXEEXT) test_web_seed$(EXEEXT) \
 	test_web_seed_ban$(EXEEXT) test_web_seed_chunked$(EXEEXT) \
 	test_web_seed_http$(EXEEXT) test_web_seed_http_pw$(EXEEXT) \
 	test_web_seed_redirect$(EXEEXT) test_web_seed_socks4$(EXEEXT) \
-	test_web_seed_socks5$(EXEEXT) test_web_seed_socks5_pw$(EXEEXT) \
-	test_url_seed$(EXEEXT) test_remap_files$(EXEEXT) \
-	test_gzip$(EXEEXT) test_utf8$(EXEEXT) test_socket_io$(EXEEXT) \
+	test_web_seed_socks5$(EXEEXT) \
+	test_web_seed_socks5_no_peers$(EXEEXT) \
+	test_web_seed_socks5_pw$(EXEEXT) test_url_seed$(EXEEXT) \
+	test_remap_files$(EXEEXT) test_gzip$(EXEEXT) \
+	test_utf8$(EXEEXT) test_socket_io$(EXEEXT) \
 	test_sliding_average$(EXEEXT)
 am_enum_if_OBJECTS = enum_if.$(OBJEXT)
 enum_if_OBJECTS = $(am_enum_if_OBJECTS)
@@ -253,11 +263,6 @@
 test_metadata_extension_LDADD = $(LDADD)
 test_metadata_extension_DEPENDENCIES = libtest.la \
 	$(top_builddir)/src/libtorrent-rasterbar.la
-am_test_natpmp_OBJECTS = test_natpmp.$(OBJEXT)
-test_natpmp_OBJECTS = $(am_test_natpmp_OBJECTS)
-test_natpmp_LDADD = $(LDADD)
-test_natpmp_DEPENDENCIES = libtest.la \
-	$(top_builddir)/src/libtorrent-rasterbar.la
 am_test_packet_buffer_OBJECTS = test_packet_buffer.$(OBJEXT)
 test_packet_buffer_OBJECTS = $(am_test_packet_buffer_OBJECTS)
 test_packet_buffer_LDADD = $(LDADD)
@@ -455,6 +460,13 @@
 test_web_seed_socks5_LDADD = $(LDADD)
 test_web_seed_socks5_DEPENDENCIES = libtest.la \
 	$(top_builddir)/src/libtorrent-rasterbar.la
+am_test_web_seed_socks5_no_peers_OBJECTS =  \
+	test_web_seed_socks5_no_peers.$(OBJEXT)
+test_web_seed_socks5_no_peers_OBJECTS =  \
+	$(am_test_web_seed_socks5_no_peers_OBJECTS)
+test_web_seed_socks5_no_peers_LDADD = $(LDADD)
+test_web_seed_socks5_no_peers_DEPENDENCIES = libtest.la \
+	$(top_builddir)/src/libtorrent-rasterbar.la
 am_test_web_seed_socks5_pw_OBJECTS =  \
 	test_web_seed_socks5_pw.$(OBJEXT)
 test_web_seed_socks5_pw_OBJECTS =  \
@@ -512,28 +524,28 @@
 	$(test_http_parser_SOURCES) $(test_ip_filter_SOURCES) \
 	$(test_ip_voter_SOURCES) $(test_lsd_SOURCES) \
 	$(test_magnet_SOURCES) $(test_metadata_extension_SOURCES) \
-	$(test_natpmp_SOURCES) $(test_packet_buffer_SOURCES) \
-	$(test_pe_crypto_SOURCES) $(test_peer_priority_SOURCES) \
-	$(test_pex_SOURCES) $(test_piece_picker_SOURCES) \
-	$(test_primitives_SOURCES) $(test_priority_SOURCES) \
-	$(test_privacy_SOURCES) $(test_read_piece_SOURCES) \
-	$(test_remap_files_SOURCES) $(test_resume_SOURCES) \
-	$(test_rss_SOURCES) $(test_session_SOURCES) \
-	$(test_sliding_average_SOURCES) $(test_socket_io_SOURCES) \
-	$(test_ssl_SOURCES) $(test_storage_SOURCES) \
-	$(test_string_SOURCES) $(test_swarm_SOURCES) \
-	$(test_threads_SOURCES) $(test_time_SOURCES) \
-	$(test_torrent_SOURCES) $(test_torrent_info_SOURCES) \
-	$(test_torrent_parse_SOURCES) $(test_tracker_SOURCES) \
-	$(test_trackers_extension_SOURCES) $(test_transfer_SOURCES) \
-	$(test_upnp_SOURCES) $(test_url_seed_SOURCES) \
-	$(test_utf8_SOURCES) $(test_utp_SOURCES) \
-	$(test_web_seed_SOURCES) $(test_web_seed_ban_SOURCES) \
-	$(test_web_seed_chunked_SOURCES) $(test_web_seed_http_SOURCES) \
-	$(test_web_seed_http_pw_SOURCES) \
+	$(test_packet_buffer_SOURCES) $(test_pe_crypto_SOURCES) \
+	$(test_peer_priority_SOURCES) $(test_pex_SOURCES) \
+	$(test_piece_picker_SOURCES) $(test_primitives_SOURCES) \
+	$(test_priority_SOURCES) $(test_privacy_SOURCES) \
+	$(test_read_piece_SOURCES) $(test_remap_files_SOURCES) \
+	$(test_resume_SOURCES) $(test_rss_SOURCES) \
+	$(test_session_SOURCES) $(test_sliding_average_SOURCES) \
+	$(test_socket_io_SOURCES) $(test_ssl_SOURCES) \
+	$(test_storage_SOURCES) $(test_string_SOURCES) \
+	$(test_swarm_SOURCES) $(test_threads_SOURCES) \
+	$(test_time_SOURCES) $(test_torrent_SOURCES) \
+	$(test_torrent_info_SOURCES) $(test_torrent_parse_SOURCES) \
+	$(test_tracker_SOURCES) $(test_trackers_extension_SOURCES) \
+	$(test_transfer_SOURCES) $(test_upnp_SOURCES) \
+	$(test_url_seed_SOURCES) $(test_utf8_SOURCES) \
+	$(test_utp_SOURCES) $(test_web_seed_SOURCES) \
+	$(test_web_seed_ban_SOURCES) $(test_web_seed_chunked_SOURCES) \
+	$(test_web_seed_http_SOURCES) $(test_web_seed_http_pw_SOURCES) \
 	$(test_web_seed_redirect_SOURCES) \
 	$(test_web_seed_socks4_SOURCES) \
 	$(test_web_seed_socks5_SOURCES) \
+	$(test_web_seed_socks5_no_peers_SOURCES) \
 	$(test_web_seed_socks5_pw_SOURCES) $(test_xml_SOURCES)
 DIST_SOURCES = $(libtest_la_SOURCES) $(enum_if_SOURCES) \
 	$(test_auto_unchoke_SOURCES) $(test_bandwidth_limiter_SOURCES) \
@@ -546,28 +558,28 @@
 	$(test_http_parser_SOURCES) $(test_ip_filter_SOURCES) \
 	$(test_ip_voter_SOURCES) $(test_lsd_SOURCES) \
 	$(test_magnet_SOURCES) $(test_metadata_extension_SOURCES) \
-	$(test_natpmp_SOURCES) $(test_packet_buffer_SOURCES) \
-	$(test_pe_crypto_SOURCES) $(test_peer_priority_SOURCES) \
-	$(test_pex_SOURCES) $(test_piece_picker_SOURCES) \
-	$(test_primitives_SOURCES) $(test_priority_SOURCES) \
-	$(test_privacy_SOURCES) $(test_read_piece_SOURCES) \
-	$(test_remap_files_SOURCES) $(test_resume_SOURCES) \
-	$(test_rss_SOURCES) $(test_session_SOURCES) \
-	$(test_sliding_average_SOURCES) $(test_socket_io_SOURCES) \
-	$(test_ssl_SOURCES) $(test_storage_SOURCES) \
-	$(test_string_SOURCES) $(test_swarm_SOURCES) \
-	$(test_threads_SOURCES) $(test_time_SOURCES) \
-	$(test_torrent_SOURCES) $(test_torrent_info_SOURCES) \
-	$(test_torrent_parse_SOURCES) $(test_tracker_SOURCES) \
-	$(test_trackers_extension_SOURCES) $(test_transfer_SOURCES) \
-	$(test_upnp_SOURCES) $(test_url_seed_SOURCES) \
-	$(test_utf8_SOURCES) $(test_utp_SOURCES) \
-	$(test_web_seed_SOURCES) $(test_web_seed_ban_SOURCES) \
-	$(test_web_seed_chunked_SOURCES) $(test_web_seed_http_SOURCES) \
-	$(test_web_seed_http_pw_SOURCES) \
+	$(test_packet_buffer_SOURCES) $(test_pe_crypto_SOURCES) \
+	$(test_peer_priority_SOURCES) $(test_pex_SOURCES) \
+	$(test_piece_picker_SOURCES) $(test_primitives_SOURCES) \
+	$(test_priority_SOURCES) $(test_privacy_SOURCES) \
+	$(test_read_piece_SOURCES) $(test_remap_files_SOURCES) \
+	$(test_resume_SOURCES) $(test_rss_SOURCES) \
+	$(test_session_SOURCES) $(test_sliding_average_SOURCES) \
+	$(test_socket_io_SOURCES) $(test_ssl_SOURCES) \
+	$(test_storage_SOURCES) $(test_string_SOURCES) \
+	$(test_swarm_SOURCES) $(test_threads_SOURCES) \
+	$(test_time_SOURCES) $(test_torrent_SOURCES) \
+	$(test_torrent_info_SOURCES) $(test_torrent_parse_SOURCES) \
+	$(test_tracker_SOURCES) $(test_trackers_extension_SOURCES) \
+	$(test_transfer_SOURCES) $(test_upnp_SOURCES) \
+	$(test_url_seed_SOURCES) $(test_utf8_SOURCES) \
+	$(test_utp_SOURCES) $(test_web_seed_SOURCES) \
+	$(test_web_seed_ban_SOURCES) $(test_web_seed_chunked_SOURCES) \
+	$(test_web_seed_http_SOURCES) $(test_web_seed_http_pw_SOURCES) \
 	$(test_web_seed_redirect_SOURCES) \
 	$(test_web_seed_socks4_SOURCES) \
 	$(test_web_seed_socks5_SOURCES) \
+	$(test_web_seed_socks5_no_peers_SOURCES) \
 	$(test_web_seed_socks5_pw_SOURCES) $(test_xml_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -798,6 +810,9 @@
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -854,6 +869,7 @@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -986,7 +1002,6 @@
   test_primitives            \
   test_http_parser           \
   test_magnet                \
-  test_natpmp                \
   test_packet_buffer         \
   test_read_piece            \
   test_resume                \
@@ -1014,6 +1029,7 @@
   test_web_seed_redirect     \
   test_web_seed_socks4       \
   test_web_seed_socks5       \
+  test_web_seed_socks5_no_peers \
   test_web_seed_socks5_pw    \
   test_url_seed              \
   test_remap_files           \
@@ -1073,7 +1089,8 @@
   pb.xml \
   upnp.xml \
   zeroes.gz \
-  utf8_test.txt
+  utf8_test.txt \
+  test_natpmp.cpp
 
 noinst_HEADERS = test.hpp setup_transfer.hpp dht_server.hpp \
 	peer_server.hpp udp_tracker.hpp web_seed_suite.hpp
@@ -1113,7 +1130,6 @@
 test_primitives_SOURCES = test_primitives.cpp
 test_http_parser_SOURCES = test_http_parser.cpp
 test_magnet_SOURCES = test_magnet.cpp
-test_natpmp_SOURCES = test_natpmp.cpp
 test_packet_buffer_SOURCES = test_packet_buffer.cpp
 test_read_piece_SOURCES = test_read_piece.cpp
 test_storage_SOURCES = test_storage.cpp
@@ -1141,6 +1157,7 @@
 test_web_seed_redirect_SOURCES = test_web_seed_redirect.cpp
 test_web_seed_socks4_SOURCES = test_web_seed_socks4.cpp
 test_web_seed_socks5_SOURCES = test_web_seed_socks5.cpp
+test_web_seed_socks5_no_peers_SOURCES = test_web_seed_socks5_no_peers.cpp
 test_web_seed_socks5_pw_SOURCES = test_web_seed_socks5_pw.cpp
 test_url_seed_SOURCES = test_url_seed.cpp
 test_remap_files_SOURCES = test_remap_files.cpp
@@ -1169,7 +1186,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign test/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -1295,10 +1311,6 @@
 	@rm -f test_metadata_extension$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_metadata_extension_OBJECTS) $(test_metadata_extension_LDADD) $(LIBS)
 
-test_natpmp$(EXEEXT): $(test_natpmp_OBJECTS) $(test_natpmp_DEPENDENCIES) $(EXTRA_test_natpmp_DEPENDENCIES) 
-	@rm -f test_natpmp$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(test_natpmp_OBJECTS) $(test_natpmp_LDADD) $(LIBS)
-
 test_packet_buffer$(EXEEXT): $(test_packet_buffer_OBJECTS) $(test_packet_buffer_DEPENDENCIES) $(EXTRA_test_packet_buffer_DEPENDENCIES) 
 	@rm -f test_packet_buffer$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_packet_buffer_OBJECTS) $(test_packet_buffer_LDADD) $(LIBS)
@@ -1455,6 +1467,10 @@
 	@rm -f test_web_seed_socks5$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_web_seed_socks5_OBJECTS) $(test_web_seed_socks5_LDADD) $(LIBS)
 
+test_web_seed_socks5_no_peers$(EXEEXT): $(test_web_seed_socks5_no_peers_OBJECTS) $(test_web_seed_socks5_no_peers_DEPENDENCIES) $(EXTRA_test_web_seed_socks5_no_peers_DEPENDENCIES) 
+	@rm -f test_web_seed_socks5_no_peers$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(test_web_seed_socks5_no_peers_OBJECTS) $(test_web_seed_socks5_no_peers_LDADD) $(LIBS)
+
 test_web_seed_socks5_pw$(EXEEXT): $(test_web_seed_socks5_pw_OBJECTS) $(test_web_seed_socks5_pw_DEPENDENCIES) $(EXTRA_test_web_seed_socks5_pw_DEPENDENCIES) 
 	@rm -f test_web_seed_socks5_pw$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_web_seed_socks5_pw_OBJECTS) $(test_web_seed_socks5_pw_LDADD) $(LIBS)
@@ -1494,7 +1510,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_lsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_magnet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_metadata_extension.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_natpmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packet_buffer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pe_crypto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_peer_priority.Po@am__quote@
@@ -1534,6 +1549,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_web_seed_redirect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_web_seed_socks4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_web_seed_socks5.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_web_seed_socks5_no_peers.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_web_seed_socks5_pw.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_xml.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/udp_tracker.Plo@am__quote@
@@ -1651,7 +1667,7 @@
 	if test -n "$$am__remaking_logs"; then \
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 	       "recursion detected" >&2; \
-	else \
+	elif test -n "$$redo_logs"; then \
 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 	fi; \
 	if $(am__make_dryrun); then :; else \
@@ -1958,13 +1974,6 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_natpmp.log: test_natpmp$(EXEEXT)
-	@p='test_natpmp$(EXEEXT)'; \
-	b='test_natpmp'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test_packet_buffer.log: test_packet_buffer$(EXEEXT)
 	@p='test_packet_buffer$(EXEEXT)'; \
 	b='test_packet_buffer'; \
@@ -2154,6 +2163,13 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test_web_seed_socks5_no_peers.log: test_web_seed_socks5_no_peers$(EXEEXT)
+	@p='test_web_seed_socks5_no_peers$(EXEEXT)'; \
+	b='test_web_seed_socks5_no_peers'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test_web_seed_socks5_pw.log: test_web_seed_socks5_pw$(EXEEXT)
 	@p='test_web_seed_socks5_pw$(EXEEXT)'; \
 	b='test_web_seed_socks5_pw'; \
@@ -2375,6 +2391,8 @@
 	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
 	uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru libtorrent-rasterbar-1.0.6/test/test_bencoding.cpp libtorrent-rasterbar-1.0.7/test/test_bencoding.cpp
--- libtorrent-rasterbar-1.0.6/test/test_bencoding.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/test_bencoding.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -437,7 +437,9 @@
 		lazy_entry e;
 		error_code ec;
 		int ret = lazy_bdecode(b, b + sizeof(b)-1, e, ec, NULL);
-		TEST_EQUAL(ret, 0);
+		TEST_EQUAL(ret, -1);
+		TEST_EQUAL(ec, error_code(bdecode_errors::unexpected_eof
+			, get_bdecode_category()));
 		printf("%s\n", print_entry(e).c_str());
 	}
 
diff -Nru libtorrent-rasterbar-1.0.6/test/test_dht.cpp libtorrent-rasterbar-1.0.7/test/test_dht.cpp
--- libtorrent-rasterbar-1.0.6/test/test_dht.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/test_dht.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -452,6 +452,7 @@
 	address ext = address::from_string("236.0.0.1");
 	mock_socket s;
 	print_alert ad;
+
 	dht::node_impl node(&ad, &s, sett, node_id(0), ext, 0);
 
 	// DHT should be running on port 48199 now
@@ -747,7 +748,7 @@
 
 	udp::endpoint eps[1000];
 
- 	for (int i = 0; i < 1000; ++i)
+	for (int i = 0; i < 1000; ++i)
 		eps[i] = udp::endpoint(rand_v4(), (rand() % 16534) + 1);
 
 	announce_item items[] =
@@ -919,7 +920,7 @@
 #ifdef TORRENT_USE_VALGRIND
 		VALGRIND_CHECK_MEM_IS_DEFINED(signature, item_sig_len);
 #endif
-		// break the signature 
+		// break the signature
 		signature[2] ^= 0xaa;
 
 		fprintf(stderr, "PUT broken signature\n");
@@ -1046,19 +1047,60 @@
 		node_id diff = to_hash("15764f7459456a9453f8719b09547c11d5f34061");
 
 		routing_table tbl(id, 8, sett);
-   
+
 		// insert 256 nodes evenly distributed across the ID space.
 		// we expect to fill the top 5 buckets
-		for (int i = 0; i < 256; ++i)
+		for (int i = 255; i >= 0; --i)
 		{
 			// test a node with the same IP:port changing ID
 			add_and_replace(id, diff);
-			id[0] = i;
+			// in order to make this node-load a bit more realistic, start from
+			// distant nodes and work our way in closer to the node id
+			// the routing table will reject nodes that are too imbalanced (if all
+			// nodes are very close to our ID and none are far away, it's
+			// suspicious).
+			id[0] ^= i;
 			tbl.node_seen(id, rand_ep(), 20 + (id[19] & 0xff));
+
+			// restore the first byte of the node ID
+			id[0] ^= i;
+
+#if defined TORRENT_DHT_VERBOSE_LOGGING || defined TORRENT_DEBUG
+			tbl.print_state(std::cerr);
+#endif
 		}
 		printf("num_active_buckets: %d\n", tbl.num_active_buckets());
-		TEST_EQUAL(tbl.num_active_buckets(), 6);
-   
+		// number of nodes per tree level (when adding 256 evenly distributed
+		// nodes):
+		// 0: 128
+		// 1: 64
+		// 2: 32
+		// 3: 16
+		// 4: 8
+		// i.e. no more than 5 levels
+		TEST_EQUAL(tbl.num_active_buckets(), 5);
+
+#if defined TORRENT_DHT_VERBOSE_LOGGING || defined TORRENT_DEBUG
+		tbl.print_state(std::cerr);
+#endif
+	}
+
+	{
+		sett.extended_routing_table = false;
+		node_id id = to_hash("1234876923549721020394873245098347598635");
+
+		routing_table tbl(id, 8, sett);
+
+		// insert nodes in the routing table that will force it to split
+		// and make sure we don't end up with a table completely out of balance
+		for (int i = 0; i < 32; ++i)
+		{
+			id[4] = i;
+			tbl.node_seen(id, rand_ep(), 20 + (id[19] & 0xff));
+		}
+		printf("num_active_buckets: %d\n", tbl.num_active_buckets());
+		TEST_EQUAL(tbl.num_active_buckets(), 2);
+
 #if defined TORRENT_DHT_VERBOSE_LOGGING || defined TORRENT_DEBUG
 		tbl.print_state(std::cerr);
 #endif
diff -Nru libtorrent-rasterbar-1.0.6/test/test_fast_extension.cpp libtorrent-rasterbar-1.0.7/test/test_fast_extension.cpp
--- libtorrent-rasterbar-1.0.6/test/test_fast_extension.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/test_fast_extension.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -517,7 +517,9 @@
 	test_respect_suggest();
 	test_multiple_bitfields();
 	test_multiple_have_all();
+#ifndef TORRENT_DISABLE_EXTENSIONS
 	test_dont_have();
+#endif
 
 	return 0;
 }
diff -Nru libtorrent-rasterbar-1.0.6/test/test_http_parser.cpp libtorrent-rasterbar-1.0.7/test/test_http_parser.cpp
--- libtorrent-rasterbar-1.0.6/test/test_http_parser.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/test_http_parser.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -358,11 +358,11 @@
 		== make_tuple("http", "", "192.168.0.1", -1, "/path/to/file"));
 
 	TEST_CHECK(parse_url_components("http://[2001:ff00::1]:42/path/to/file", ec)
-		== make_tuple("http", "", "[2001:ff00::1]", 42, "/path/to/file"));
+		== make_tuple("http", "", "2001:ff00::1", 42, "/path/to/file"));
 
 	// leading spaces are supposed to be stripped
 	TEST_CHECK(parse_url_components(" \thttp://[2001:ff00::1]:42/path/to/file", ec)
-		== make_tuple("http", "", "[2001:ff00::1]", 42, "/path/to/file"));
+		== make_tuple("http", "", "2001:ff00::1", 42, "/path/to/file"));
 
 	parse_url_components("http://[2001:ff00::1:42/path/to/file", ec);
 	TEST_CHECK(ec == error_code(errors::expected_close_bracket_in_address));
diff -Nru libtorrent-rasterbar-1.0.6/test/test_resume.cpp libtorrent-rasterbar-1.0.7/test/test_resume.cpp
--- libtorrent-rasterbar-1.0.6/test/test_resume.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/test_resume.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -42,6 +42,7 @@
 #include "setup_transfer.hpp"
 
 using namespace libtorrent;
+namespace lt = libtorrent;
 
 boost::intrusive_ptr<torrent_info> generate_torrent()
 {
@@ -50,6 +51,7 @@
 	libtorrent::create_torrent t(fs, 128 * 1024, 6);
 
 	t.add_tracker("http://torrent_file_tracker.com/announce");
+	t.add_url_seed("http://torrent_file_url_seed.com/");
 
 	int num = t.num_pieces();
 	TEST_CHECK(num > 0);
@@ -121,10 +123,8 @@
 	return ret;
 }
 
-torrent_status test_resume_flags(int flags)
+torrent_handle test_resume_flags(lt::session& ses, int flags)
 {
-	session ses;
-
 	boost::intrusive_ptr<torrent_info> ti = generate_torrent();
 
 	add_torrent_params p;
@@ -149,9 +149,8 @@
 	p.file_priorities.push_back(2);
 
 	torrent_handle h = ses.add_torrent(p);
-	torrent_status s = h.status();
-	TEST_EQUAL(s.info_hash, ti->info_hash());
-	return s;
+	TEST_EQUAL(h.status().info_hash, ti->info_hash());
+	return h;
 }
 
 void default_tests(torrent_status const& s)
@@ -203,7 +202,45 @@
 	TEST_EQUAL(h.piece_priority(ti->num_pieces()-1), 0);
 }
 
-void test_seed_mode(bool file_prio, bool pieces_have, bool piece_prio)
+void test_file_prio()
+{
+	fprintf(stderr, "test_file_prio\n");
+
+	session ses;
+	boost::intrusive_ptr<torrent_info> ti = generate_torrent();
+	add_torrent_params p;
+	p.ti = ti;
+	p.save_path = ".";
+
+	entry rd;
+
+	rd["file-format"] = "libtorrent resume file";
+	rd["file-version"] = 1;
+	rd["info-hash"] = ti->info_hash().to_string();
+	rd["blocks per piece"] = (std::max)(1, ti->piece_length() / 0x4000);
+
+	entry::list_type& file_prio = rd["file_priority"].list();
+	for (int i = 0; i < 100; ++i)
+	{
+		file_prio.push_back(entry(0));
+	}
+
+	std::string pieces(ti->num_pieces(), '\x01');
+	rd["pieces"] = pieces;
+
+	std::string pieces_prio(ti->num_pieces(), '\x01');
+	rd["piece_priority"] = pieces_prio;
+
+	bencode(back_inserter(p.resume_data), rd);
+
+	torrent_handle h = ses.add_torrent(p);
+
+	torrent_status s = h.status();
+	TEST_EQUAL(s.total_wanted, 0);
+}
+
+void test_seed_mode(bool file_prio, bool pieces_have, bool piece_prio
+	, bool all_files_zero = false)
 {
 	fprintf(stderr, "test_seed_mode file_prio: %d pieces_have: %d piece_prio: %d\n"
 		, file_prio, pieces_have, piece_prio);
@@ -226,6 +263,13 @@
 		// this should take it out of seed_mode
 		entry::list_type& file_prio = rd["file_priority"].list();
 		file_prio.push_back(entry(0));
+		if (all_files_zero)
+		{
+			for (int i = 0; i < 100; ++i)
+			{
+				file_prio.push_back(entry(0));
+			}
+		}
 	}
 
 	std::string pieces(ti->num_pieces(), '\x01');
@@ -261,6 +305,8 @@
 
 int test_main()
 {
+	test_file_prio();
+
 	test_seed_mode(true, false, false);
 	test_seed_mode(false, true, false);
 	test_seed_mode(false, false, true);
@@ -268,10 +314,11 @@
 
 	test_piece_priorities();
 
+	boost::scoped_ptr<lt::session> ses(new lt::session());
 	torrent_status s;
 
 	fprintf(stderr, "flags: 0\n");
-	s = test_resume_flags(0);
+	s = test_resume_flags(*ses, 0).status();
 	default_tests(s);
 #ifdef TORRENT_WINDOWS
 	TEST_EQUAL(s.save_path, "c:\\add_torrent_params save_path");
@@ -290,7 +337,8 @@
 	TEST_EQUAL(s.uploads_limit, 1346);
 
 	fprintf(stderr, "flags: use_resume_save_path\n");
-	s = test_resume_flags(add_torrent_params::flag_use_resume_save_path);
+	ses.reset(new lt::session());
+	s = test_resume_flags(*ses, add_torrent_params::flag_use_resume_save_path).status();
 	default_tests(s);
 #ifdef TORRENT_WINDOWS
 	TEST_EQUAL(s.save_path, "c:\\resume_data save_path");
@@ -309,8 +357,9 @@
 	TEST_EQUAL(s.uploads_limit, 1346);
 
 	fprintf(stderr, "flags: override_resume_data\n");
-	s = test_resume_flags(add_torrent_params::flag_override_resume_data
-		| add_torrent_params::flag_paused);
+	ses.reset(new lt::session());
+	s = test_resume_flags(*ses, add_torrent_params::flag_override_resume_data
+		| add_torrent_params::flag_paused).status();
 
 	default_tests(s);
 #ifdef TORRENT_WINDOWS
@@ -330,8 +379,9 @@
 	TEST_EQUAL(s.uploads_limit, 1);
 
 	fprintf(stderr, "flags: seed_mode\n");
-	s = test_resume_flags(add_torrent_params::flag_override_resume_data
-		| add_torrent_params::flag_seed_mode);
+	ses.reset(new lt::session());
+	s = test_resume_flags(*ses, add_torrent_params::flag_override_resume_data
+		| add_torrent_params::flag_seed_mode).status();
 	default_tests(s);
 #ifdef TORRENT_WINDOWS
 	TEST_EQUAL(s.save_path, "c:\\add_torrent_params save_path");
@@ -350,7 +400,8 @@
 	TEST_EQUAL(s.uploads_limit, 1);
 
 	fprintf(stderr, "flags: upload_mode\n");
-	s = test_resume_flags(add_torrent_params::flag_upload_mode);
+	ses.reset(new lt::session());
+	s = test_resume_flags(*ses, add_torrent_params::flag_upload_mode).status();
 	default_tests(s);
 #ifdef TORRENT_WINDOWS
 	TEST_EQUAL(s.save_path, "c:\\add_torrent_params save_path");
@@ -369,8 +420,9 @@
 	TEST_EQUAL(s.uploads_limit, 1346);
 
 	fprintf(stderr, "flags: share_mode\n");
-	s = test_resume_flags(add_torrent_params::flag_override_resume_data
-		| add_torrent_params::flag_share_mode);
+	ses.reset(new lt::session());
+	s = test_resume_flags(*ses, add_torrent_params::flag_override_resume_data
+		| add_torrent_params::flag_share_mode).status();
 	default_tests(s);
 #ifdef TORRENT_WINDOWS
 	TEST_EQUAL(s.save_path, "c:\\add_torrent_params save_path");
@@ -390,7 +442,8 @@
 
 	// resume data overrides the auto-managed flag
 	fprintf(stderr, "flags: auto_managed\n");
-	s = test_resume_flags(add_torrent_params::flag_auto_managed);
+	ses.reset(new lt::session());
+	s = test_resume_flags(*ses, add_torrent_params::flag_auto_managed).status();
 	default_tests(s);
 #ifdef TORRENT_WINDOWS
 	TEST_EQUAL(s.save_path, "c:\\add_torrent_params save_path");
@@ -410,7 +463,8 @@
 
 	// resume data overrides the paused flag
 	fprintf(stderr, "flags: paused\n");
-	s = test_resume_flags(add_torrent_params::flag_paused);
+	ses.reset(new lt::session());
+	s = test_resume_flags(*ses, add_torrent_params::flag_paused).status();
 	default_tests(s);
 #ifdef TORRENT_WINDOWS
 	TEST_EQUAL(s.save_path, "c:\\add_torrent_params save_path");
@@ -428,6 +482,42 @@
 	TEST_EQUAL(s.connections_limit, 1345);
 	TEST_EQUAL(s.uploads_limit, 1346);
 
+	// merge url seeds with resume data
+	fprintf(stderr, "flags: merge_resume_http_seeds\n");
+	ses.reset(new lt::session());
+	torrent_handle h = test_resume_flags(*ses,
+		add_torrent_params::flag_merge_resume_http_seeds);
+	std::set<std::string> us = h.url_seeds();
+	std::set<std::string> ws = h.http_seeds();
+
+	TEST_EQUAL(us.size(), 3);
+	TEST_EQUAL(std::count(us.begin(), us.end()
+		, "http://add_torrent_params_url_seed.com"), 1);
+	TEST_EQUAL(std::count(us.begin(), us.end()
+		, "http://torrent_file_url_seed.com/"), 1);
+	TEST_EQUAL(std::count(us.begin(), us.end()
+		, "http://resume_data_url_seed.com"), 1);
+
+	TEST_EQUAL(ws.size(), 1);
+	TEST_EQUAL(std::count(ws.begin(), ws.end()
+		, "http://resume_data_http_seed.com"), 1);
+
+	// resume data overrides the .torrent_file
+	fprintf(stderr, "flags: no merge_resume_http_seed\n");
+	ses.reset(new lt::session());
+	h = test_resume_flags(*ses,
+		add_torrent_params::flag_merge_resume_trackers);
+	us = h.url_seeds();
+	ws = h.http_seeds();
+
+	TEST_EQUAL(ws.size(), 1);
+	TEST_EQUAL(std::count(ws.begin(), ws.end()
+		, "http://resume_data_http_seed.com"), 1);
+
+	TEST_EQUAL(us.size(), 1);
+	TEST_EQUAL(std::count(us.begin(), us.end()
+		, "http://resume_data_url_seed.com"), 1);
+
 	// TODO: 2 test all other resume flags here too. This would require returning
 	// more than just the torrent_status from test_resume_flags. Also http seeds
 	// and trackers for instance
diff -Nru libtorrent-rasterbar-1.0.6/test/test_torrent.cpp libtorrent-rasterbar-1.0.7/test/test_torrent.cpp
--- libtorrent-rasterbar-1.0.6/test/test_torrent.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/test_torrent.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -138,8 +138,46 @@
 	}
 }
 
+void test_total_wanted()
+{
+	file_storage fs;
+
+	fs.add_file("test_torrent_dir4/tmp1", 1024);
+	fs.add_file("test_torrent_dir4/tmp2", 1024);
+	fs.add_file("test_torrent_dir4/tmp3", 1024);
+	fs.add_file("test_torrent_dir4/tmp4", 1024);
+
+	libtorrent::create_torrent t(fs, 1024);
+	std::vector<char> tmp;
+	bencode(std::back_inserter(tmp), t.generate());
+	error_code ec;
+	boost::intrusive_ptr<torrent_info> info(new torrent_info(&tmp[0], tmp.size(), ec));
+
+	session ses(fingerprint("LT", 0, 1, 0, 0), std::make_pair(48130, 48140), "0.0.0.0", 0);
+
+	add_torrent_params p;
+	p.ti = info;
+	p.save_path = ".";
+
+	// we just want 1 out of 4 files, 1024 out of 4096 bytes
+	p.file_priorities.resize(4, 0);
+	p.file_priorities[1] = 1;
+
+	p.ti = info;
+
+	torrent_handle h = ses.add_torrent(p);
+
+	torrent_status st = h.status();
+	std::cout << "total_wanted: " << st.total_wanted << " : " << 1024 << std::endl;
+	TEST_EQUAL(st.total_wanted, 1024);
+	std::cout << "total_wanted_done: " << st.total_wanted_done << " : 0" << std::endl;
+	TEST_EQUAL(st.total_wanted_done, 0);
+}
+
 int test_main()
 {
+	test_total_wanted();
+
 	{
 		remove("test_torrent_dir2/tmp1");
 		remove("test_torrent_dir2/tmp2");
@@ -155,7 +193,7 @@
 		std::vector<char> piece(128 * 1024);
 		for (int i = 0; i < int(piece.size()); ++i)
 			piece[i] = (i % 26) + 'A';
-		
+
 		// calculate the hash for all pieces
 		sha1_hash ph = hasher(&piece[0], piece.size()).final();
 		int num = t.num_pieces();
@@ -178,7 +216,6 @@
 
 		fs.add_file("test_torrent_dir2/tmp1", 0);
 		libtorrent::create_torrent t(fs, 128 * 1024, 6);
-		t.add_tracker("http://non-existing.com/announce");
 
 		std::vector<char> tmp;
 		std::back_insert_iterator<std::vector<char> > out(tmp);
diff -Nru libtorrent-rasterbar-1.0.6/test/test_torrent_info.cpp libtorrent-rasterbar-1.0.7/test/test_torrent_info.cpp
--- libtorrent-rasterbar-1.0.6/test/test_torrent_info.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/test_torrent_info.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -95,6 +95,6 @@
 		fprintf(stderr, "%s == %s\n", p.c_str(), filenames[i]);
 		TEST_CHECK(p == filenames[i]);
 	}
-	
+
 	return 0;
 }
diff -Nru libtorrent-rasterbar-1.0.6/test/test_web_seed_socks5_no_peers.cpp libtorrent-rasterbar-1.0.7/test/test_web_seed_socks5_no_peers.cpp
--- libtorrent-rasterbar-1.0.6/test/test_web_seed_socks5_no_peers.cpp	1970-01-01 00:00:00.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/test_web_seed_socks5_no_peers.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+
+Copyright (c) 2008, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "test.hpp"
+#include "setup_transfer.hpp"
+#include "web_seed_suite.hpp"
+
+using namespace libtorrent;
+
+const int proxy = libtorrent::proxy_settings::socks5;
+
+int test_main()
+{
+	int ret = 0;
+	for (int url_seed = 0; url_seed < 2; ++url_seed)
+	{
+#ifdef TORRENT_USE_OPENSSL
+		run_http_suite(proxy, "https", url_seed, false, false, false, false, false);
+#endif
+		run_http_suite(proxy, "http", url_seed, false, false, false, false, false);
+	}
+	return ret;
+}
+
diff -Nru libtorrent-rasterbar-1.0.6/test/web_seed_suite.cpp libtorrent-rasterbar-1.0.7/test/web_seed_suite.cpp
--- libtorrent-rasterbar-1.0.6/test/web_seed_suite.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/web_seed_suite.cpp	2015-11-14 05:21:45.000000000 +0000
@@ -80,7 +80,7 @@
 // proxy: 0=none, 1=socks4, 2=socks5, 3=socks5_pw 4=http 5=http_pw
 void test_transfer(session& ses, boost::intrusive_ptr<torrent_info> torrent_file
 	, int proxy, int port, char const* protocol, bool url_seed
-	, bool chunked_encoding, bool test_ban, bool keepalive)
+	, bool chunked_encoding, bool test_ban, bool keepalive, bool proxy_peers)
 {
 	using namespace libtorrent;
 
@@ -108,6 +108,7 @@
 		ps.username = "testuser";
 		ps.password = "testpass";
 		ps.type = (proxy_settings::proxy_type)proxy;
+		ps.proxy_peer_connections = proxy_peers;
 		ses.set_proxy(ps);
 	}
 	else
@@ -117,6 +118,7 @@
 		ps.username.clear();
 		ps.password.clear();
 		ps.type = proxy_settings::none;
+		ps.proxy_peer_connections = proxy_peers;
 		ses.set_proxy(ps);
 	}
 
@@ -240,7 +242,8 @@
 // protocol: "http" or "https"
 // test_url_seed determines whether to use url-seed or http-seed
 int EXPORT run_http_suite(int proxy, char const* protocol, bool test_url_seed
-	, bool chunked_encoding, bool test_ban, bool keepalive, bool test_rename)
+	, bool chunked_encoding, bool test_ban, bool keepalive, bool test_rename
+	, bool proxy_peers)
 {
 	using namespace libtorrent;
 
@@ -365,13 +368,13 @@
 		if (ec) fprintf(stderr, "listen_on failed: %s\n", ec.message().c_str());
    
 		test_transfer(ses, torrent_file, proxy, port, protocol, test_url_seed
-			, chunked_encoding, test_ban, keepalive);
+			, chunked_encoding, test_ban, keepalive, proxy_peers);
 		
 		if (test_url_seed && test_rename)
 		{
 			torrent_file->rename_file(0, combine_path(save_path, combine_path("torrent_dir", "renamed_test1")));
 			test_transfer(ses, torrent_file, 0, port, protocol, test_url_seed
-				, chunked_encoding, test_ban, keepalive);
+				, chunked_encoding, test_ban, keepalive, proxy_peers);
 		}
 	}
 
diff -Nru libtorrent-rasterbar-1.0.6/test/web_seed_suite.hpp libtorrent-rasterbar-1.0.7/test/web_seed_suite.hpp
--- libtorrent-rasterbar-1.0.6/test/web_seed_suite.hpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/test/web_seed_suite.hpp	2015-11-14 05:21:45.000000000 +0000
@@ -34,10 +34,10 @@
 
 int EXPORT run_http_suite(int proxy, char const* protocol
 	, bool test_url_seed, bool chunked_encoding = false, bool test_ban = false
-	, bool keepalive = true, bool test_rename = false);
+	, bool keepalive = true, bool test_rename = false, bool proxy_peers = true);
 
 void EXPORT test_transfer(libtorrent::session& ses
 	, boost::intrusive_ptr<libtorrent::torrent_info> torrent_file
 	, int proxy = 0, int port = 0, char const* protocol = "http"
 	, bool url_seed = true, bool chunked_encoding = false
-	, bool test_ban = false, bool keepalive = true);
+	, bool test_ban = false, bool keepalive = true, bool proxy_peers = true);
diff -Nru libtorrent-rasterbar-1.0.6/tools/Jamfile libtorrent-rasterbar-1.0.7/tools/Jamfile
--- libtorrent-rasterbar-1.0.6/tools/Jamfile	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/tools/Jamfile	2015-11-14 05:21:39.000000000 +0000
@@ -33,7 +33,6 @@
 	<link>static
    ;  
 
-exe parse_hash_fails : parse_hash_fails.cpp ;
 exe parse_request_log : parse_request_log.cpp ;
 exe dht : dht_put.cpp : <include>../ed25519/src ;
 
diff -Nru libtorrent-rasterbar-1.0.6/tools/Makefile.am libtorrent-rasterbar-1.0.7/tools/Makefile.am
--- libtorrent-rasterbar-1.0.6/tools/Makefile.am	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/tools/Makefile.am	2015-11-14 05:21:39.000000000 +0000
@@ -1,5 +1,4 @@
 tool_programs =  \
-  parse_hash_fails \
   parse_request_log
 
 if ENABLE_EXAMPLES
@@ -25,7 +24,6 @@
   run_regression_tests.py\
   run_tests.py
 
-parse_hash_fails_SOURCES = parse_hash_fails.cpp
 parse_request_log_SOURCES = parse_request_log.cpp
 
 LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
diff -Nru libtorrent-rasterbar-1.0.6/tools/Makefile.in libtorrent-rasterbar-1.0.7/tools/Makefile.in
--- libtorrent-rasterbar-1.0.6/tools/Makefile.in	2015-07-30 04:11:48.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/tools/Makefile.in	2015-11-14 05:34:05.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -82,8 +92,6 @@
 @ENABLE_EXAMPLES_TRUE@bin_PROGRAMS = $(am__EXEEXT_1)
 EXTRA_PROGRAMS = $(am__EXEEXT_1)
 subdir = tools
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
 	$(top_srcdir)/m4/ax_boost_python.m4 \
@@ -99,26 +107,22 @@
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = parse_hash_fails$(EXEEXT) parse_request_log$(EXEEXT)
+am__EXEEXT_1 = parse_request_log$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_parse_hash_fails_OBJECTS = parse_hash_fails.$(OBJEXT)
-parse_hash_fails_OBJECTS = $(am_parse_hash_fails_OBJECTS)
-parse_hash_fails_LDADD = $(LDADD)
-parse_hash_fails_DEPENDENCIES =  \
-	$(top_builddir)/src/libtorrent-rasterbar.la
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
 am_parse_request_log_OBJECTS = parse_request_log.$(OBJEXT)
 parse_request_log_OBJECTS = $(am_parse_request_log_OBJECTS)
 parse_request_log_LDADD = $(LDADD)
 parse_request_log_DEPENDENCIES =  \
 	$(top_builddir)/src/libtorrent-rasterbar.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -153,9 +157,8 @@
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(parse_hash_fails_SOURCES) $(parse_request_log_SOURCES)
-DIST_SOURCES = $(parse_hash_fails_SOURCES) \
-	$(parse_request_log_SOURCES)
+SOURCES = $(parse_request_log_SOURCES)
+DIST_SOURCES = $(parse_request_log_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -180,6 +183,8 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -236,6 +241,7 @@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -339,7 +345,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 tool_programs = \
-  parse_hash_fails \
   parse_request_log
 
 EXTRA_DIST = Jamfile     \
@@ -360,7 +365,6 @@
   run_regression_tests.py\
   run_tests.py
 
-parse_hash_fails_SOURCES = parse_hash_fails.cpp
 parse_request_log_SOURCES = parse_request_log.cpp
 LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
 AM_CPPFLAGS = -ftemplate-depth-50 -I$(top_srcdir)/include @DEBUGFLAGS@
@@ -381,7 +385,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign tools/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -449,10 +452,6 @@
 	echo " rm -f" $$list; \
 	rm -f $$list
 
-parse_hash_fails$(EXEEXT): $(parse_hash_fails_OBJECTS) $(parse_hash_fails_DEPENDENCIES) $(EXTRA_parse_hash_fails_DEPENDENCIES) 
-	@rm -f parse_hash_fails$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(parse_hash_fails_OBJECTS) $(parse_hash_fails_LDADD) $(LIBS)
-
 parse_request_log$(EXEEXT): $(parse_request_log_OBJECTS) $(parse_request_log_DEPENDENCIES) $(EXTRA_parse_request_log_DEPENDENCIES) 
 	@rm -f parse_request_log$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(parse_request_log_OBJECTS) $(parse_request_log_LDADD) $(LIBS)
@@ -463,7 +462,6 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_hash_fails.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_request_log.Po@am__quote@
 
 .cpp.o:
@@ -698,6 +696,8 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
 
+.PRECIOUS: Makefile
+
 #AM_LDFLAGS = $(LDFLAGS) @BOOST_SYSTEM_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
 #AM_LDFLAGS = @OPENSSL_LDFLAGS@
 
diff -Nru libtorrent-rasterbar-1.0.6/tools/parse_hash_fails.cpp libtorrent-rasterbar-1.0.7/tools/parse_hash_fails.cpp
--- libtorrent-rasterbar-1.0.6/tools/parse_hash_fails.cpp	2015-06-04 23:58:26.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/tools/parse_hash_fails.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-/*
-
-Copyright (c) 2012, Arvid Norberg
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the distribution.
-    * Neither the name of the author nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#include <stdlib.h>
-#include <string>
-#include <cstring>
-#include "libtorrent/file.hpp"
-
-using namespace libtorrent;
-
-void print_usage()
-{
-	fprintf(stderr, "usage: parse_hash_fails log-directory\n");
-	exit(1);
-}
-
-int main(int argc, char* argv[])
-{
-	if (argc != 2) print_usage();
-
-	error_code ec;
-	directory d(argv[1], ec);
-	if (ec)
-	{
-		fprintf(stderr, "failed to open directory: %s\n%s\n"
-			, argv[1], ec.message().c_str());
-		return 1;
-	}
-
-	for (; !d.done(); d.next(ec))
-	{
-		if (ec)
-		{
-			fprintf(stderr, "error listing directory: %s\n", ec.message().c_str());
-			return 1;
-		}
-		std::string filename = d.file();
-		char hash[41];
-		int piece;
-		int block;
-		char state[10]; // good, bad
-		if (sscanf(filename.c_str(), "%40s_%d_%d_%4s.block", hash, &piece, &block, state) != 4)
-		{
-			fprintf(stderr, "no match: %s\n", filename.c_str());
-			continue;
-		}
-
-		if (strcmp(state, "good") != 0) continue;
-
-		char target_filename[1024];
-		snprintf(target_filename, sizeof(target_filename), "%s_%d_%d.diff", hash, piece, block);
-
-		fprintf(stderr, "diffing %s\n", filename.c_str());
-		char cmdline[2048];
-		snprintf(cmdline, sizeof(cmdline), "xxd %s >temp_good", combine_path(argv[1], filename).c_str());
-		system(cmdline);
-		snprintf(cmdline, sizeof(cmdline), "xxd %s/%s_%d_%d_bad.block >temp_bad", argv[1], hash, piece, block);
-		system(cmdline);
-		snprintf(cmdline, sizeof(cmdline), "diff -y temp_good temp_bad | colordiff >%s"
-			, combine_path(argv[1], target_filename).c_str());
-		system(cmdline);
-	}
-
-	FILE* log_file = fopen(argv[1], "r");
-	if (log_file == 0)
-	{
-		fprintf(stderr, "failed to open logfile: %s\n%d: %s\n"
-			, argv[1], errno, strerror(errno));
-		return 1;
-	}
-
-	return 0;
-}
-
-
diff -Nru libtorrent-rasterbar-1.0.6/tools/parse_request_log.cpp libtorrent-rasterbar-1.0.7/tools/parse_request_log.cpp
--- libtorrent-rasterbar-1.0.6/tools/parse_request_log.cpp	2015-07-30 02:26:29.000000000 +0000
+++ libtorrent-rasterbar-1.0.7/tools/parse_request_log.cpp	2015-11-14 05:21:39.000000000 +0000
@@ -30,13 +30,16 @@
 
 */
 
-#include "libtorrent/file.hpp"
+#include "libtorrent/config.hpp"
 #include "libtorrent/io.hpp"
 #include <cstring>
 #include <boost/bind.hpp>
 #include <stdlib.h>
 #include <map>
 #include <vector>
+#include <assert.h>
+#include <stdio.h>
+#include <errno.h>
 
 using namespace libtorrent;
 using namespace libtorrent::detail; // for write_* and read_*