diff --git a/ChangeLog b/ChangeLog
index 47fde55b5..3c6f0ecdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,8 @@
 	* almost completely changed the storage interface (for custom storage)
 	* added support for hashing pieces in multiple threads
 
+1.0.5 release
+
 	* improve ip_voter to avoid flapping
 	* fixed bug when max_peerlist_size was set to 0
 	* fix issues with missing exported symbols when building dll
diff --git a/docs/building.html b/docs/building.html
index f7a9dbc24..6972da71a 100644
--- a/docs/building.html
+++ b/docs/building.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -276,10 +277,10 @@ libraries.</li>
 </tr>
 <tr><td><tt class="docutils literal">logging</tt></td>
 <td><ul class="first last simple">
-<li><tt class="docutils literal">off</tt> - default. logging disabled.</li>
-<li><tt class="docutils literal">on</tt> - logging alerts available, still need to
-be enabled by the alert mask. The reason logging
-is disabled by default is to keep the binary
+<li><tt class="docutils literal">off</tt> - logging alerts disabled.</li>
+<li><tt class="docutils literal">on</tt> - default. logging alerts available,
+still need to be enabled by the alert mask. The
+reason to disable logging is to keep the binary
 size down.</li>
 </ul>
 </td>
@@ -294,16 +295,6 @@ logging of the DHT protocol traffic.</li>
 </ul>
 </td>
 </tr>
-<tr><td><tt class="docutils literal"><span class="pre">need-librt</span></tt></td>
-<td><ul class="first last simple">
-<li><tt class="docutils literal">no</tt> - this platform does not need to link
-against librt to have POSIX time functions.</li>
-<li><tt class="docutils literal">yes</tt> - specify this if your linux system
-requires you to link against librt.a. This is
-typically the case on x86 64 bit systems.</li>
-</ul>
-</td>
-</tr>
 <tr><td><tt class="docutils literal">asserts</tt></td>
 <td><ul class="first last simple">
 <li><tt class="docutils literal">auto</tt> - asserts are on if in debug mode</li>
@@ -320,14 +311,6 @@ filename.</li>
 </ul>
 </td>
 </tr>
-<tr><td><tt class="docutils literal"><span class="pre">upnp-logging</span></tt></td>
-<td><ul class="first last simple">
-<li><tt class="docutils literal">off</tt> - default. Does not log UPnP traffic.</li>
-<li><tt class="docutils literal">on</tt> - creates &quot;upnp.log&quot; with the messages
-sent to and received from UPnP devices.</li>
-</ul>
-</td>
-</tr>
 <tr><td><tt class="docutils literal">encryption</tt></td>
 <td><ul class="first last simple">
 <li><tt class="docutils literal">on</tt> - encrypted bittorrent connections
@@ -338,6 +321,14 @@ implementation is used.</li>
 </ul>
 </td>
 </tr>
+<tr><td><tt class="docutils literal"><span class="pre">mutable-torrents</span></tt></td>
+<td><ul class="first last simple">
+<li><tt class="docutils literal">on</tt> - mutable torrents are supported
+(<a class="reference external" href="http://www.bittorrent.org/beps/bep_0038.html">BEP 38</a>) (default).</li>
+<li><tt class="docutils literal">off</tt> - mutable torrents are not supported.</li>
+</ul>
+</td>
+</tr>
 <tr><td><tt class="docutils literal">crypto</tt></td>
 <td><ul class="first last simple">
 <li><tt class="docutils literal"><span class="pre">built-in</span></tt> - (default) uses built-in SHA-1
@@ -435,16 +426,6 @@ functions are used.</li>
 </ul>
 </td>
 </tr>
-<tr><td><tt class="docutils literal"><span class="pre">full-stats</span></tt></td>
-<td><ul class="first last simple">
-<li><tt class="docutils literal">on</tt> - default, collects stats for IP overhead
-and DHT and trackers. This uses a little bit
-extra memory for each peer and torrent.</li>
-<li><tt class="docutils literal">off</tt> - only collects the standard stats for
-upload and download rate.</li>
-</ul>
-</td>
-</tr>
 <tr><td><tt class="docutils literal">iconv</tt></td>
 <td><ul class="first last simple">
 <li><tt class="docutils literal">auto</tt> - use iconv for string conversions for
@@ -462,28 +443,6 @@ awareness except on windows).</li>
 </ul>
 </td>
 </tr>
-<tr><td><tt class="docutils literal"><span class="pre">boost-date-time</span></tt></td>
-<td><ul class="first last simple">
-<li><tt class="docutils literal">off</tt> - don't build asio types that depend
-on boost.date_time. libtorrent doesn't use them
-but if the client does, you need these to be
-built.</li>
-<li><tt class="docutils literal">on</tt> - build asio types that depend on
-boost.date_time.</li>
-</ul>
-</td>
-</tr>
-<tr><td><tt class="docutils literal">statistics</tt></td>
-<td><ul class="first last simple">
-<li><tt class="docutils literal">off</tt> - default. No logging of additional
-stats.</li>
-<li><tt class="docutils literal">on</tt> - log session statistics in current
-working directory session_stats&lt;pid&gt;. The log
-is rotated every hour. It can be parsed by the
-parse_session_stats.py script (requires gnuplot)</li>
-</ul>
-</td>
-</tr>
 <tr><td><tt class="docutils literal"><span class="pre">profile-calls</span></tt></td>
 <td><ul class="first last simple">
 <li><tt class="docutils literal">off</tt> - default. No additional call profiling.</li>
@@ -647,10 +606,10 @@ files. Potential problems is different
 compilation units having different views of
 structs and class layouts and sizes.</td>
 </tr>
-<tr><td><tt class="docutils literal">TORRENT_LOGGING</tt></td>
-<td>This macro will enable support for logging
+<tr><td><tt class="docutils literal">TORRENT_DISABLE_LOGGING</tt></td>
+<td>This macro will disable support for logging
 alerts, like log_alert, torrent_log_alert and
-peer_log_alert. Without this build flag, you
+peer_log_alert. With this build flag, you
 cannot enable those alerts.</td>
 </tr>
 <tr><td><tt class="docutils literal">TORRENT_STORAGE_DEBUG</tt></td>
@@ -658,12 +617,6 @@ cannot enable those alerts.</td>
 checks in the storage, including logging of
 piece sorting.</td>
 </tr>
-<tr><td><tt class="docutils literal">TORRENT_UPNP_LOGGING</tt></td>
-<td>Generates a &quot;upnp.log&quot; file with the UPnP
-traffic. This is very useful when debugging
-support for various UPnP routers.
-support for various UPnP routers.</td>
-</tr>
 <tr><td><tt class="docutils literal">TORRENT_DISK_STATS</tt></td>
 <td>This will create a log of all disk activity
 which later can parsed and graphed using
@@ -678,6 +631,9 @@ operations.</td>
 <tr><td><tt class="docutils literal">TORRENT_DISABLE_POOL_ALLOCATOR</tt></td>
 <td>Disables use of <tt class="docutils literal"><span class="pre">boost::pool&lt;&gt;</span></tt>.</td>
 </tr>
+<tr><td><tt class="docutils literal">TORRENT_DISABLE_MUTABLE_TORRENTS</tt></td>
+<td>Disables mutable torrent support (<a class="reference external" href="http://www.bittorrent.org/beps/bep_0038.html">BEP 38</a>)</td>
+</tr>
 <tr><td><tt class="docutils literal">TORRENT_LINKING_SHARED</tt></td>
 <td>If this is defined when including the
 libtorrent headers, the classes and functions
@@ -813,7 +769,7 @@ be picked up by libtorrent.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/client_test.html b/docs/client_test.html
index 0f4752f3d..454354383 100644
--- a/docs/client_test.html
+++ b/docs/client_test.html
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>client_test example program</title>
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -18,6 +18,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -104,7 +105,7 @@ which peer that sent the corrupt data if a piece fails the hash test.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/contributing.html b/docs/contributing.html
index d0c693bc6..5e33ebfb8 100644
--- a/docs/contributing.html
+++ b/docs/contributing.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -125,7 +126,7 @@ algorithms, seeding policies, ports to new platforms etc.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/dht_extensions.html b/docs/dht_extensions.html
index 9d46b0c39..679de2e8b 100644
--- a/docs/dht_extensions.html
+++ b/docs/dht_extensions.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title></title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -140,7 +141,7 @@ only IPv4 nodes present.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/dht_rss.html b/docs/dht_rss.html
index bfc1ee16c..3d52252b4 100644
--- a/docs/dht_rss.html
+++ b/docs/dht_rss.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>BitTorrent extension for DHT RSS feeds</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -427,7 +428,7 @@ in both C and Java.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/dht_sec.html b/docs/dht_sec.html
index d03608d52..67fbd8c8c 100644
--- a/docs/dht_sec.html
+++ b/docs/dht_sec.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>BitTorrent DHT security extension</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -297,7 +298,7 @@ are accepted.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/dht_store.html b/docs/dht_store.html
index 03a84b2aa..c18096906 100644
--- a/docs/dht_store.html
+++ b/docs/dht_store.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>BitTorrent extension for arbitrary DHT store</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -530,7 +531,7 @@ e5f96f6f38320f0f33959cb4d3d656452117aadb
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/examples.html b/docs/examples.html
index 673ad6f13..cf8942c4a 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>libtorrent Examples</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -127,9 +128,14 @@ instructions for how to use it <a class="reference external" href="client_test.h
 #include &quot;libtorrent/create_torrent.hpp&quot;
 #include &quot;libtorrent/file.hpp&quot;
 #include &quot;libtorrent/file_pool.hpp&quot;
+#include &quot;libtorrent/hex.hpp&quot; </span><span class="comment single">// for from_hex
 </span>
 <span class="comment preproc">#include &lt;boost/bind.hpp&gt;
 </span>
+<span class="comment preproc">#ifdef TORRENT_WINDOWS
+#include &lt;direct.h&gt; </span><span class="comment single">// for _getcwd
+</span><span class="comment preproc">#endif
+</span>
 <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="name">libtorrent</span><span class="punctuation">;</span>
 
 <span class="keyword type">int</span> <span class="name function">load_file</span><span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="keyword">const</span><span class="operator">&amp;</span> <span class="name">filename</span><span class="punctuation">,</span> <span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="keyword type">char</span><span class="operator">&gt;&amp;</span> <span class="name">v</span><span class="punctuation">,</span> <span class="name">libtorrent</span><span class="operator">::</span><span class="name">error_code</span><span class="operator">&amp;</span> <span class="name">ec</span><span class="punctuation">,</span> <span class="keyword type">int</span> <span class="name">limit</span> <span class="operator">=</span> <span class="literal number integer">8000000</span><span class="punctuation">)</span>
@@ -193,54 +199,102 @@ instructions for how to use it <a class="reference external" href="client_test.h
   <span class="keyword">return</span> <span class="literal number integer">0</span><span class="punctuation">;</span>
 <span class="punctuation">}</span>
 
+<span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="name">branch_path</span><span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="keyword">const</span><span class="operator">&amp;</span> <span class="name">f</span><span class="punctuation">)</span>
+<span class="punctuation">{</span>
+  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">f</span><span class="punctuation">.</span><span class="name">empty</span><span class="punctuation">())</span> <span class="keyword">return</span> <span class="name">f</span><span class="punctuation">;</span>
+
+<span class="comment preproc">#ifdef TORRENT_WINDOWS
+</span>  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">f</span> <span class="operator">==</span> <span class="literal string">&quot;</span><span class="literal string escape">\\\\</span><span class="literal string">&quot;</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="literal string">&quot;&quot;</span><span class="punctuation">;</span>
+<span class="comment preproc">#endif
+</span>  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">f</span> <span class="operator">==</span> <span class="literal string">&quot;/&quot;</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="literal string">&quot;&quot;</span><span class="punctuation">;</span>
+
+  <span class="keyword type">int</span> <span class="name">len</span> <span class="operator">=</span> <span class="name">f</span><span class="punctuation">.</span><span class="name">size</span><span class="punctuation">();</span>
+  <span class="comment single">// if the last character is / or \ ignore it
+</span>  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">f</span><span class="punctuation">[</span><span class="name">len</span><span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">]</span> <span class="operator">==</span> <span class="literal string char">'/'</span> <span class="operator">||</span> <span class="name">f</span><span class="punctuation">[</span><span class="name">len</span><span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">]</span> <span class="operator">==</span> <span class="literal string char">'\\'</span><span class="punctuation">)</span> <span class="operator">--</span><span class="name">len</span><span class="punctuation">;</span>
+  <span class="keyword">while</span> <span class="punctuation">(</span><span class="name">len</span> <span class="operator">&gt;</span> <span class="literal number integer">0</span><span class="punctuation">)</span>
+  <span class="punctuation">{</span>
+    <span class="operator">--</span><span class="name">len</span><span class="punctuation">;</span>
+    <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">f</span><span class="punctuation">[</span><span class="name">len</span><span class="punctuation">]</span> <span class="operator">==</span> <span class="literal string char">'/'</span> <span class="operator">||</span> <span class="name">f</span><span class="punctuation">[</span><span class="name">len</span><span class="punctuation">]</span> <span class="operator">==</span> <span class="literal string char">'\\'</span><span class="punctuation">)</span>
+      <span class="keyword">break</span><span class="punctuation">;</span>
+  <span class="punctuation">}</span>
+
+  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">f</span><span class="punctuation">[</span><span class="name">len</span><span class="punctuation">]</span> <span class="operator">==</span> <span class="literal string char">'/'</span> <span class="operator">||</span> <span class="name">f</span><span class="punctuation">[</span><span class="name">len</span><span class="punctuation">]</span> <span class="operator">==</span> <span class="literal string char">'\\'</span><span class="punctuation">)</span> <span class="operator">++</span><span class="name">len</span><span class="punctuation">;</span>
+  <span class="keyword">return</span> <span class="name">std</span><span class="operator">::</span><span class="name">string</span><span class="punctuation">(</span><span class="name">f</span><span class="punctuation">.</span><span class="name">c_str</span><span class="punctuation">(),</span> <span class="name">len</span><span class="punctuation">);</span>
+<span class="punctuation">}</span>
+
 <span class="comment single">// do not include files and folders whose
 // name starts with a .
-</span><span class="keyword type">bool</span> <span class="name function">file_filter</span><span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="keyword">const</span><span class="operator">&amp;</span> <span class="name">f</span><span class="punctuation">)</span>
+</span><span class="keyword type">bool</span> <span class="name">file_filter</span><span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="keyword">const</span><span class="operator">&amp;</span> <span class="name">f</span><span class="punctuation">)</span>
 <span class="punctuation">{</span>
-  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">filename</span><span class="punctuation">(</span><span class="name">f</span><span class="punctuation">)[</span><span class="literal number integer">0</span><span class="punctuation">]</span> <span class="operator">==</span> <span class="literal string char">'.'</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="name builtin">false</span><span class="punctuation">;</span>
+  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">f</span><span class="punctuation">.</span><span class="name">empty</span><span class="punctuation">())</span> <span class="keyword">return</span> <span class="name builtin">false</span><span class="punctuation">;</span>
+
+  <span class="keyword type">char</span> <span class="keyword">const</span><span class="operator">*</span> <span class="name">first</span> <span class="operator">=</span> <span class="name">f</span><span class="punctuation">.</span><span class="name">c_str</span><span class="punctuation">();</span>
+  <span class="keyword type">char</span> <span class="keyword">const</span><span class="operator">*</span> <span class="name">sep</span> <span class="operator">=</span> <span class="name">strrchr</span><span class="punctuation">(</span><span class="name">first</span><span class="punctuation">,</span> <span class="literal string char">'/'</span><span class="punctuation">);</span>
+<span class="comment preproc">#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
+</span>  <span class="keyword type">char</span> <span class="keyword">const</span><span class="operator">*</span> <span class="name">altsep</span> <span class="operator">=</span> <span class="name">strrchr</span><span class="punctuation">(</span><span class="name">first</span><span class="punctuation">,</span> <span class="literal string char">'\\'</span><span class="punctuation">);</span>
+  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">sep</span> <span class="operator">==</span> <span class="name builtin">NULL</span> <span class="operator">||</span> <span class="name">altsep</span> <span class="operator">&gt;</span> <span class="name">sep</span><span class="punctuation">)</span> <span class="name">sep</span> <span class="operator">=</span> <span class="name">altsep</span><span class="punctuation">;</span>
+<span class="comment preproc">#endif
+</span>  <span class="comment single">// if there is no parent path, just set 'sep'
+</span>  <span class="comment single">// to point to the filename.
+</span>  <span class="comment single">// if there is a parent path, skip the '/' character
+</span>  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">sep</span> <span class="operator">==</span> <span class="name builtin">NULL</span><span class="punctuation">)</span> <span class="name">sep</span> <span class="operator">=</span> <span class="name">first</span><span class="punctuation">;</span>
+  <span class="keyword">else</span> <span class="operator">++</span><span class="name">sep</span><span class="punctuation">;</span>
+
+  <span class="comment single">// return false if the first character of the filename is a .
+</span>  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">sep</span><span class="punctuation">[</span><span class="literal number integer">0</span><span class="punctuation">]</span> <span class="operator">==</span> <span class="literal string char">'.'</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="name builtin">false</span><span class="punctuation">;</span>
+
   <span class="name">fprintf</span><span class="punctuation">(</span><span class="name">stderr</span><span class="punctuation">,</span> <span class="literal string">&quot;%s</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span><span class="punctuation">,</span> <span class="name">f</span><span class="punctuation">.</span><span class="name">c_str</span><span class="punctuation">());</span>
   <span class="keyword">return</span> <span class="name builtin">true</span><span class="punctuation">;</span>
 <span class="punctuation">}</span>
 
-<span class="keyword type">void</span> <span class="name function">print_progress</span><span class="punctuation">(</span><span class="keyword type">int</span> <span class="name">i</span><span class="punctuation">,</span> <span class="keyword type">int</span> <span class="name">num</span><span class="punctuation">)</span>
+<span class="keyword type">void</span> <span class="name">print_progress</span><span class="punctuation">(</span><span class="keyword type">int</span> <span class="name">i</span><span class="punctuation">,</span> <span class="keyword type">int</span> <span class="name">num</span><span class="punctuation">)</span>
 <span class="punctuation">{</span>
   <span class="name">fprintf</span><span class="punctuation">(</span><span class="name">stderr</span><span class="punctuation">,</span> <span class="literal string">&quot;</span><span class="literal string escape">\r</span><span class="literal string">%d/%d&quot;</span><span class="punctuation">,</span> <span class="name">i</span><span class="operator">+</span><span class="literal number integer">1</span><span class="punctuation">,</span> <span class="name">num</span><span class="punctuation">);</span>
 <span class="punctuation">}</span>
 
-<span class="keyword type">void</span> <span class="name function">print_usage</span><span class="punctuation">()</span>
+<span class="keyword type">void</span> <span class="name">print_usage</span><span class="punctuation">()</span>
 <span class="punctuation">{</span>
   <span class="name">fputs</span><span class="punctuation">(</span><span class="literal string">&quot;usage: make_torrent FILE [OPTIONS]</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
     <span class="literal string">&quot;</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
     <span class="literal string">&quot;Generates a torrent file from the specified file</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
     <span class="literal string">&quot;or directory and writes it to standard out</span><span class="literal string escape">\n\n</span><span class="literal string">&quot;</span>
     <span class="literal string">&quot;OPTIONS:</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-m file     generate a merkle hash tree torrent.</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            merkle torrents require client support</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            the resulting full merkle tree is written to</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            the specified file</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-w url      adds a web seed to the torrent with</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            the specified url</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-t url      adds the specified tracker to the</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            torrent. For multiple trackers, specify more</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            -t options</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-c comment  sets the comment to the specified string</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-C creator  sets the created-by field to the specified string</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-p bytes    enables padding files. Files larger</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            than bytes will be piece-aligned</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-s bytes    specifies a piece size for the torrent</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            This has to be a multiple of 16 kiB</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-l          Don't follow symlinks, instead encode them as</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            links in the torrent file</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-o file     specifies the output filename of the torrent file</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            If this is not specified, the torrent file is</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            printed to the standard out, except on windows</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            where the filename defaults to a.torrent</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;-r file     add root certificate to the torrent, to verify</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            the HTTPS tracker</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-m file       generate a merkle hash tree torrent.</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              merkle torrents require client support</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              the resulting full merkle tree is written to</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              the specified file</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-w url        adds a web seed to the torrent with</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              the specified url</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-t url        adds the specified tracker to the</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              torrent. For multiple trackers, specify more</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              -t options</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-c comment    sets the comment to the specified string</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-C creator    sets the created-by field to the specified string</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-p bytes      enables padding files. Files larger</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              than bytes will be piece-aligned</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-s bytes      specifies a piece size for the torrent</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              This has to be a multiple of 16 kiB</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-l            Don't follow symlinks, instead encode them as</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              links in the torrent file</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-o file       specifies the output filename of the torrent file</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              If this is not specified, the torrent file is</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              printed to the standard out, except on windows</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              where the filename defaults to a.torrent</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-r file       add root certificate to the torrent, to verify</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              the HTTPS tracker</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-S info-hash  add a similar torrent by info-hash. The similar</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              torrent is expected to share some files with this one</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-L collection add a collection name to this torrent. Other torrents</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              in the same collection is expected to share files</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              with this one.</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;-M            make the torrent compatible with mutable torrents</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              this means aligning large files and pad them in order</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              for piece hashes to uniquely indentify a file without</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
+    <span class="literal string">&quot;              overlap</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
     <span class="punctuation">,</span> <span class="name">stderr</span><span class="punctuation">);</span>
 <span class="punctuation">}</span>
 
-<span class="keyword type">int</span> <span class="name function">main</span><span class="punctuation">(</span><span class="keyword type">int</span> <span class="name">argc</span><span class="punctuation">,</span> <span class="keyword type">char</span><span class="operator">*</span> <span class="name">argv</span><span class="punctuation">[])</span>
+<span class="keyword type">int</span> <span class="name">main</span><span class="punctuation">(</span><span class="keyword type">int</span> <span class="name">argc</span><span class="punctuation">,</span> <span class="keyword type">char</span><span class="operator">*</span> <span class="name">argv</span><span class="punctuation">[])</span>
 <span class="punctuation">{</span>
   <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="name">libtorrent</span><span class="punctuation">;</span>
 
@@ -259,6 +313,8 @@ instructions for how to use it <a class="reference external" href="client_test.h
 <span class="comment preproc">#endif
 </span>    <span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span><span class="operator">&gt;</span> <span class="name">web_seeds</span><span class="punctuation">;</span>
     <span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span><span class="operator">&gt;</span> <span class="name">trackers</span><span class="punctuation">;</span>
+    <span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span><span class="operator">&gt;</span> <span class="name">collections</span><span class="punctuation">;</span>
+    <span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="name">sha1_hash</span><span class="operator">&gt;</span> <span class="name">similar</span><span class="punctuation">;</span>
     <span class="keyword type">int</span> <span class="name">pad_file_limit</span> <span class="operator">=</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">;</span>
     <span class="keyword type">int</span> <span class="name">piece_size</span> <span class="operator">=</span> <span class="literal number integer">0</span><span class="punctuation">;</span>
     <span class="keyword type">int</span> <span class="name">flags</span> <span class="operator">=</span> <span class="literal number integer">0</span><span class="punctuation">;</span>
@@ -290,6 +346,10 @@ instructions for how to use it <a class="reference external" href="client_test.h
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">trackers</span><span class="punctuation">.</span><span class="name">push_back</span><span class="punctuation">(</span><span class="name">argv</span><span class="punctuation">[</span><span class="name">i</span><span class="punctuation">]);</span>
           <span class="keyword">break</span><span class="punctuation">;</span>
+        <span class="keyword">case</span> <span class="literal string char">'M'</span><span class="operator">:</span>
+          <span class="name">flags</span> <span class="operator">|=</span> <span class="name">create_torrent</span><span class="operator">::</span><span class="name">mutable_torrent_support</span><span class="punctuation">;</span>
+          <span class="name">pad_file_limit</span> <span class="operator">=</span> <span class="literal number hex">0x4000</span><span class="punctuation">;</span>
+          <span class="keyword">break</span><span class="punctuation">;</span>
         <span class="keyword">case</span> <span class="literal string char">'p'</span><span class="operator">:</span>
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">pad_file_limit</span> <span class="operator">=</span> <span class="name">atoi</span><span class="punctuation">(</span><span class="name">argv</span><span class="punctuation">[</span><span class="name">i</span><span class="punctuation">]);</span>
@@ -323,6 +383,30 @@ instructions for how to use it <a class="reference external" href="client_test.h
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">root_cert</span> <span class="operator">=</span> <span class="name">argv</span><span class="punctuation">[</span><span class="name">i</span><span class="punctuation">];</span>
           <span class="keyword">break</span><span class="punctuation">;</span>
+        <span class="keyword">case</span> <span class="literal string char">'S'</span><span class="operator">:</span>
+          <span class="punctuation">{</span>
+          <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
+          <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">strlen</span><span class="punctuation">(</span><span class="name">argv</span><span class="punctuation">[</span><span class="name">i</span><span class="punctuation">])</span> <span class="operator">!=</span> <span class="literal number integer">40</span><span class="punctuation">)</span>
+          <span class="punctuation">{</span>
+            <span class="name">fprintf</span><span class="punctuation">(</span><span class="name">stderr</span><span class="punctuation">,</span> <span class="literal string">&quot;invalid info-hash for -S. &quot;</span>
+              <span class="literal string">&quot;Expected 40 hex characters</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span><span class="punctuation">);</span>
+            <span class="name">print_usage</span><span class="punctuation">();</span>
+            <span class="keyword">return</span> <span class="literal number integer">1</span><span class="punctuation">;</span>
+          <span class="punctuation">}</span>
+          <span class="name">sha1_hash</span> <span class="name">ih</span><span class="punctuation">;</span>
+          <span class="keyword">if</span> <span class="punctuation">(</span><span class="operator">!</span><span class="name">from_hex</span><span class="punctuation">(</span><span class="name">argv</span><span class="punctuation">[</span><span class="name">i</span><span class="punctuation">],</span> <span class="literal number integer">40</span><span class="punctuation">,</span> <span class="punctuation">(</span><span class="keyword type">char</span><span class="operator">*</span><span class="punctuation">)</span><span class="operator">&amp;</span><span class="name">ih</span><span class="punctuation">[</span><span class="literal number integer">0</span><span class="punctuation">]))</span>
+          <span class="punctuation">{</span>
+            <span class="name">fprintf</span><span class="punctuation">(</span><span class="name">stderr</span><span class="punctuation">,</span> <span class="literal string">&quot;invalid info-hash for -S</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span><span class="punctuation">);</span>
+            <span class="name">print_usage</span><span class="punctuation">();</span>
+            <span class="keyword">return</span> <span class="literal number integer">1</span><span class="punctuation">;</span>
+          <span class="punctuation">}</span>
+          <span class="name">similar</span><span class="punctuation">.</span><span class="name">push_back</span><span class="punctuation">(</span><span class="name">ih</span><span class="punctuation">);</span>
+          <span class="punctuation">}</span>
+          <span class="keyword">break</span><span class="punctuation">;</span>
+        <span class="keyword">case</span> <span class="literal string char">'L'</span><span class="operator">:</span>
+          <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
+          <span class="name">collections</span><span class="punctuation">.</span><span class="name">push_back</span><span class="punctuation">(</span><span class="name">argv</span><span class="punctuation">[</span><span class="name">i</span><span class="punctuation">]);</span>
+          <span class="keyword">break</span><span class="punctuation">;</span>
         <span class="keyword">default</span><span class="operator">:</span>
           <span class="name">print_usage</span><span class="punctuation">();</span>
           <span class="keyword">return</span> <span class="literal number integer">1</span><span class="punctuation">;</span>
@@ -330,7 +414,22 @@ instructions for how to use it <a class="reference external" href="client_test.h
     <span class="punctuation">}</span>
 
     <span class="name">file_storage</span> <span class="name">fs</span><span class="punctuation">;</span>
-    <span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="name">full_path</span> <span class="operator">=</span> <span class="name">libtorrent</span><span class="operator">::</span><span class="name">complete</span><span class="punctuation">(</span><span class="name">argv</span><span class="punctuation">[</span><span class="literal number integer">1</span><span class="punctuation">]);</span>
+    <span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="name">full_path</span> <span class="operator">=</span> <span class="name">argv</span><span class="punctuation">[</span><span class="literal number integer">1</span><span class="punctuation">];</span>
+<span class="comment preproc">#ifdef TORRENT_WINDOWS
+</span>    <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">full_path</span><span class="punctuation">[</span><span class="literal number integer">1</span><span class="punctuation">]</span> <span class="operator">!=</span> <span class="literal string char">':'</span><span class="punctuation">)</span>
+<span class="comment preproc">#else
+</span>    <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">full_path</span><span class="punctuation">[</span><span class="literal number integer">0</span><span class="punctuation">]</span> <span class="operator">!=</span> <span class="literal string char">'/'</span><span class="punctuation">)</span>
+<span class="comment preproc">#endif
+</span>    <span class="punctuation">{</span>
+      <span class="keyword type">char</span> <span class="name">cwd</span><span class="punctuation">[</span><span class="name">TORRENT_MAX_PATH</span><span class="punctuation">];</span>
+<span class="comment preproc">#ifdef TORRENT_WINDOWS
+</span>      <span class="name">_getcwd</span><span class="punctuation">(</span><span class="name">cwd</span><span class="punctuation">,</span> <span class="keyword">sizeof</span><span class="punctuation">(</span><span class="name">cwd</span><span class="punctuation">));</span>
+      <span class="name">full_path</span> <span class="operator">=</span> <span class="name">cwd</span> <span class="operator">+</span> <span class="punctuation">(</span><span class="literal string">&quot;</span><span class="literal string escape">\\</span><span class="literal string">&quot;</span> <span class="operator">+</span> <span class="name">full_path</span><span class="punctuation">);</span>
+<span class="comment preproc">#else
+</span>      <span class="name">getcwd</span><span class="punctuation">(</span><span class="name">cwd</span><span class="punctuation">,</span> <span class="keyword">sizeof</span><span class="punctuation">(</span><span class="name">cwd</span><span class="punctuation">));</span>
+      <span class="name">full_path</span> <span class="operator">=</span> <span class="name">cwd</span> <span class="operator">+</span> <span class="punctuation">(</span><span class="literal string">&quot;/&quot;</span> <span class="operator">+</span> <span class="name">full_path</span><span class="punctuation">);</span>
+<span class="comment preproc">#endif
+</span>    <span class="punctuation">}</span>
 
     <span class="name">add_files</span><span class="punctuation">(</span><span class="name">fs</span><span class="punctuation">,</span> <span class="name">full_path</span><span class="punctuation">,</span> <span class="name">file_filter</span><span class="punctuation">,</span> <span class="name">flags</span><span class="punctuation">);</span>
     <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">fs</span><span class="punctuation">.</span><span class="name">num_files</span><span class="punctuation">()</span> <span class="operator">==</span> <span class="literal number integer">0</span><span class="punctuation">)</span>
@@ -349,8 +448,16 @@ instructions for how to use it <a class="reference external" href="client_test.h
       <span class="punctuation">,</span> <span class="name">end</span><span class="punctuation">(</span><span class="name">web_seeds</span><span class="punctuation">.</span><span class="name">end</span><span class="punctuation">());</span> <span class="name">i</span> <span class="operator">!=</span> <span class="name">end</span><span class="punctuation">;</span> <span class="operator">++</span><span class="name">i</span><span class="punctuation">)</span>
       <span class="name">t</span><span class="punctuation">.</span><span class="name">add_url_seed</span><span class="punctuation">(</span><span class="operator">*</span><span class="name">i</span><span class="punctuation">);</span>
 
+    <span class="keyword">for</span> <span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span><span class="operator">&gt;::</span><span class="name">iterator</span> <span class="name">i</span> <span class="operator">=</span> <span class="name">collections</span><span class="punctuation">.</span><span class="name">begin</span><span class="punctuation">()</span>
+      <span class="punctuation">,</span> <span class="name">end</span><span class="punctuation">(</span><span class="name">collections</span><span class="punctuation">.</span><span class="name">end</span><span class="punctuation">());</span> <span class="name">i</span> <span class="operator">!=</span> <span class="name">end</span><span class="punctuation">;</span> <span class="operator">++</span><span class="name">i</span><span class="punctuation">)</span>
+      <span class="name">t</span><span class="punctuation">.</span><span class="name">add_collection</span><span class="punctuation">(</span><span class="operator">*</span><span class="name">i</span><span class="punctuation">);</span>
+
+    <span class="keyword">for</span> <span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="name">sha1_hash</span><span class="operator">&gt;::</span><span class="name">iterator</span> <span class="name">i</span> <span class="operator">=</span> <span class="name">similar</span><span class="punctuation">.</span><span class="name">begin</span><span class="punctuation">()</span>
+      <span class="punctuation">,</span> <span class="name">end</span><span class="punctuation">(</span><span class="name">similar</span><span class="punctuation">.</span><span class="name">end</span><span class="punctuation">());</span> <span class="name">i</span> <span class="operator">!=</span> <span class="name">end</span><span class="punctuation">;</span> <span class="operator">++</span><span class="name">i</span><span class="punctuation">)</span>
+      <span class="name">t</span><span class="punctuation">.</span><span class="name">add_similar_torrent</span><span class="punctuation">(</span><span class="operator">*</span><span class="name">i</span><span class="punctuation">);</span>
+
     <span class="name">error_code</span> <span class="name">ec</span><span class="punctuation">;</span>
-    <span class="name">set_piece_hashes</span><span class="punctuation">(</span><span class="name">t</span><span class="punctuation">,</span> <span class="name">parent_path</span><span class="punctuation">(</span><span class="name">full_path</span><span class="punctuation">)</span>
+    <span class="name">set_piece_hashes</span><span class="punctuation">(</span><span class="name">t</span><span class="punctuation">,</span> <span class="name">branch_path</span><span class="punctuation">(</span><span class="name">full_path</span><span class="punctuation">)</span>
       <span class="punctuation">,</span> <span class="name">boost</span><span class="operator">::</span><span class="name">bind</span><span class="punctuation">(</span><span class="operator">&amp;</span><span class="name">print_progress</span><span class="punctuation">,</span> <span class="name">_1</span><span class="punctuation">,</span> <span class="name">t</span><span class="punctuation">.</span><span class="name">num_pieces</span><span class="punctuation">()),</span> <span class="name">ec</span><span class="punctuation">);</span>
     <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">ec</span><span class="punctuation">)</span>
     <span class="punctuation">{</span>
@@ -432,10 +539,11 @@ print information about it to std out:</p>
 <span class="comment preproc">#include &quot;libtorrent/entry.hpp&quot;
 #include &quot;libtorrent/bencode.hpp&quot;
 #include &quot;libtorrent/torrent_info.hpp&quot;
-#include &quot;libtorrent/lazy_entry.hpp&quot;
+#include &quot;libtorrent/bdecode.hpp&quot;
 #include &quot;libtorrent/magnet_uri.hpp&quot;
 </span>
-<span class="keyword type">int</span> <span class="name function">load_file</span><span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="keyword">const</span><span class="operator">&amp;</span> <span class="name">filename</span><span class="punctuation">,</span> <span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="keyword type">char</span><span class="operator">&gt;&amp;</span> <span class="name">v</span><span class="punctuation">,</span> <span class="name">libtorrent</span><span class="operator">::</span><span class="name">error_code</span><span class="operator">&amp;</span> <span class="name">ec</span><span class="punctuation">,</span> <span class="keyword type">int</span> <span class="name">limit</span> <span class="operator">=</span> <span class="literal number integer">8000000</span><span class="punctuation">)</span>
+<span class="keyword type">int</span> <span class="name function">load_file</span><span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">string</span> <span class="keyword">const</span><span class="operator">&amp;</span> <span class="name">filename</span><span class="punctuation">,</span> <span class="name">std</span><span class="operator">::</span><span class="name">vector</span><span class="operator">&lt;</span><span class="keyword type">char</span><span class="operator">&gt;&amp;</span> <span class="name">v</span>
+  <span class="punctuation">,</span> <span class="name">libtorrent</span><span class="operator">::</span><span class="name">error_code</span><span class="operator">&amp;</span> <span class="name">ec</span><span class="punctuation">,</span> <span class="keyword type">int</span> <span class="name">limit</span> <span class="operator">=</span> <span class="literal number integer">8000000</span><span class="punctuation">)</span>
 <span class="punctuation">{</span>
   <span class="name">ec</span><span class="punctuation">.</span><span class="name">clear</span><span class="punctuation">();</span>
   <span class="keyword type">FILE</span><span class="operator">*</span> <span class="name">f</span> <span class="operator">=</span> <span class="name">fopen</span><span class="punctuation">(</span><span class="name">filename</span><span class="punctuation">.</span><span class="name">c_str</span><span class="punctuation">(),</span> <span class="literal string">&quot;rb&quot;</span><span class="punctuation">);</span>
@@ -496,58 +604,6 @@ print information about it to std out:</p>
   <span class="keyword">return</span> <span class="literal number integer">0</span><span class="punctuation">;</span>
 <span class="punctuation">}</span>
 
-<span class="keyword type">int</span> <span class="name function">line_longer_than</span><span class="punctuation">(</span><span class="name">libtorrent</span><span class="operator">::</span><span class="name">lazy_entry</span> <span class="keyword">const</span><span class="operator">&amp;</span> <span class="name">e</span><span class="punctuation">,</span> <span class="keyword type">int</span> <span class="name">limit</span><span class="punctuation">)</span>
-<span class="punctuation">{</span>
-  <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="name">libtorrent</span><span class="punctuation">;</span>
-
-  <span class="keyword type">int</span> <span class="name">line_len</span> <span class="operator">=</span> <span class="literal number integer">0</span><span class="punctuation">;</span>
-  <span class="keyword">switch</span> <span class="punctuation">(</span><span class="name">e</span><span class="punctuation">.</span><span class="name">type</span><span class="punctuation">())</span>
-  <span class="punctuation">{</span>
-  <span class="keyword">case</span> <span class="name">lazy_entry</span><span class="operator">::</span><span class="keyword type">list_t</span><span class="operator">:</span>
-    <span class="name">line_len</span> <span class="operator">+=</span> <span class="literal number integer">4</span><span class="punctuation">;</span>
-    <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">line_len</span> <span class="operator">&gt;</span> <span class="name">limit</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">;</span>
-    <span class="keyword">for</span> <span class="punctuation">(</span><span class="keyword type">int</span> <span class="name">i</span> <span class="operator">=</span> <span class="literal number integer">0</span><span class="punctuation">;</span> <span class="name">i</span> <span class="operator">&lt;</span> <span class="name">e</span><span class="punctuation">.</span><span class="name">list_size</span><span class="punctuation">();</span> <span class="operator">++</span><span class="name">i</span><span class="punctuation">)</span>
-    <span class="punctuation">{</span>
-      <span class="keyword type">int</span> <span class="name">ret</span> <span class="operator">=</span> <span class="name">line_longer_than</span><span class="punctuation">(</span><span class="operator">*</span><span class="name">e</span><span class="punctuation">.</span><span class="name">list_at</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">),</span> <span class="name">limit</span> <span class="operator">-</span> <span class="name">line_len</span><span class="punctuation">);</span>
-      <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">ret</span> <span class="operator">==</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">;</span>
-      <span class="name">line_len</span> <span class="operator">+=</span> <span class="name">ret</span> <span class="operator">+</span> <span class="literal number integer">2</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
-    <span class="keyword">break</span><span class="punctuation">;</span>
-  <span class="keyword">case</span> <span class="name">lazy_entry</span><span class="operator">::</span><span class="keyword type">dict_t</span><span class="operator">:</span>
-    <span class="name">line_len</span> <span class="operator">+=</span> <span class="literal number integer">4</span><span class="punctuation">;</span>
-    <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">line_len</span> <span class="operator">&gt;</span> <span class="name">limit</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">;</span>
-    <span class="keyword">for</span> <span class="punctuation">(</span><span class="keyword type">int</span> <span class="name">i</span> <span class="operator">=</span> <span class="literal number integer">0</span><span class="punctuation">;</span> <span class="name">i</span> <span class="operator">&lt;</span> <span class="name">e</span><span class="punctuation">.</span><span class="name">dict_size</span><span class="punctuation">();</span> <span class="operator">++</span><span class="name">i</span><span class="punctuation">)</span>
-    <span class="punctuation">{</span>
-      <span class="name">line_len</span> <span class="operator">+=</span> <span class="literal number integer">4</span> <span class="operator">+</span> <span class="name">e</span><span class="punctuation">.</span><span class="name">dict_at</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">).</span><span class="name">first</span><span class="punctuation">.</span><span class="name">size</span><span class="punctuation">();</span>
-      <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">line_len</span> <span class="operator">&gt;</span> <span class="name">limit</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">;</span>
-      <span class="keyword type">int</span> <span class="name">ret</span> <span class="operator">=</span> <span class="name">line_longer_than</span><span class="punctuation">(</span><span class="operator">*</span><span class="name">e</span><span class="punctuation">.</span><span class="name">dict_at</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">).</span><span class="name">second</span><span class="punctuation">,</span> <span class="name">limit</span> <span class="operator">-</span> <span class="name">line_len</span><span class="punctuation">);</span>
-      <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">ret</span> <span class="operator">==</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">;</span>
-      <span class="name">line_len</span> <span class="operator">+=</span> <span class="name">ret</span> <span class="operator">+</span> <span class="literal number integer">1</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
-    <span class="keyword">break</span><span class="punctuation">;</span>
-  <span class="keyword">case</span> <span class="name">lazy_entry</span><span class="operator">::</span><span class="keyword type">string_t</span><span class="operator">:</span>
-    <span class="name">line_len</span> <span class="operator">+=</span> <span class="literal number integer">3</span> <span class="operator">+</span> <span class="name">e</span><span class="punctuation">.</span><span class="name">string_length</span><span class="punctuation">();</span>
-    <span class="keyword">break</span><span class="punctuation">;</span>
-  <span class="keyword">case</span> <span class="name">lazy_entry</span><span class="operator">::</span><span class="keyword type">int_t</span><span class="operator">:</span>
-  <span class="punctuation">{</span>
-    <span class="name">boost</span><span class="operator">::</span><span class="keyword type">int64_t</span> <span class="name">val</span> <span class="operator">=</span> <span class="name">e</span><span class="punctuation">.</span><span class="name">int_value</span><span class="punctuation">();</span>
-    <span class="keyword">while</span> <span class="punctuation">(</span><span class="name">val</span> <span class="operator">&gt;</span> <span class="literal number integer">0</span><span class="punctuation">)</span>
-    <span class="punctuation">{</span>
-      <span class="operator">++</span><span class="name">line_len</span><span class="punctuation">;</span>
-      <span class="name">val</span> <span class="operator">/=</span> <span class="literal number integer">10</span><span class="punctuation">;</span>
-    <span class="punctuation">}</span>
-    <span class="name">line_len</span> <span class="operator">+=</span> <span class="literal number integer">2</span><span class="punctuation">;</span>
-  <span class="punctuation">}</span>
-  <span class="keyword">break</span><span class="punctuation">;</span>
-  <span class="keyword">case</span> <span class="name">lazy_entry</span><span class="operator">::</span><span class="keyword type">none_t</span><span class="operator">:</span>
-    <span class="name">line_len</span> <span class="operator">+=</span> <span class="literal number integer">4</span><span class="punctuation">;</span>
-    <span class="keyword">break</span><span class="punctuation">;</span>
-  <span class="punctuation">}</span>
-
-  <span class="keyword">if</span> <span class="punctuation">(</span><span class="name">line_len</span> <span class="operator">&gt;</span> <span class="name">limit</span><span class="punctuation">)</span> <span class="keyword">return</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">;</span>
-  <span class="keyword">return</span> <span class="name">line_len</span><span class="punctuation">;</span>
-<span class="punctuation">}</span>
-
 <span class="keyword type">int</span> <span class="name function">main</span><span class="punctuation">(</span><span class="keyword type">int</span> <span class="name">argc</span><span class="punctuation">,</span> <span class="keyword type">char</span><span class="operator">*</span> <span class="name">argv</span><span class="punctuation">[])</span>
 <span class="punctuation">{</span>
   <span class="keyword">using</span> <span class="keyword">namespace</span> <span class="name">libtorrent</span><span class="punctuation">;</span>
@@ -578,11 +634,11 @@ print information about it to std out:</p>
     <span class="name">fprintf</span><span class="punctuation">(</span><span class="name">stderr</span><span class="punctuation">,</span> <span class="literal string">&quot;failed to load file: %s</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span><span class="punctuation">,</span> <span class="name">ec</span><span class="punctuation">.</span><span class="name">message</span><span class="punctuation">().</span><span class="name">c_str</span><span class="punctuation">());</span>
     <span class="keyword">return</span> <span class="literal number integer">1</span><span class="punctuation">;</span>
   <span class="punctuation">}</span>
-  <span class="name">lazy_entry</span> <span class="name">e</span><span class="punctuation">;</span>
+  <span class="name">bdecode_node</span> <span class="name">e</span><span class="punctuation">;</span>
   <span class="keyword type">int</span> <span class="name">pos</span> <span class="operator">=</span> <span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">;</span>
   <span class="name">printf</span><span class="punctuation">(</span><span class="literal string">&quot;decoding. recursion limit: %d total item count limit: %d</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
     <span class="punctuation">,</span> <span class="name">depth_limit</span><span class="punctuation">,</span> <span class="name">item_limit</span><span class="punctuation">);</span>
-  <span class="name">ret</span> <span class="operator">=</span> <span class="name">lazy_bdecode</span><span class="punctuation">(</span><span class="operator">&amp;</span><span class="name">buf</span><span class="punctuation">[</span><span class="literal number integer">0</span><span class="punctuation">],</span> <span class="operator">&amp;</span><span class="name">buf</span><span class="punctuation">[</span><span class="literal number integer">0</span><span class="punctuation">]</span> <span class="operator">+</span> <span class="name">buf</span><span class="punctuation">.</span><span class="name">size</span><span class="punctuation">(),</span> <span class="name">e</span><span class="punctuation">,</span> <span class="name">ec</span><span class="punctuation">,</span> <span class="operator">&amp;</span><span class="name">pos</span>
+  <span class="name">ret</span> <span class="operator">=</span> <span class="name">bdecode</span><span class="punctuation">(</span><span class="operator">&amp;</span><span class="name">buf</span><span class="punctuation">[</span><span class="literal number integer">0</span><span class="punctuation">],</span> <span class="operator">&amp;</span><span class="name">buf</span><span class="punctuation">[</span><span class="literal number integer">0</span><span class="punctuation">]</span> <span class="operator">+</span> <span class="name">buf</span><span class="punctuation">.</span><span class="name">size</span><span class="punctuation">(),</span> <span class="name">e</span><span class="punctuation">,</span> <span class="name">ec</span><span class="punctuation">,</span> <span class="operator">&amp;</span><span class="name">pos</span>
     <span class="punctuation">,</span> <span class="name">depth_limit</span><span class="punctuation">,</span> <span class="name">item_limit</span><span class="punctuation">);</span>
 
   <span class="name">printf</span><span class="punctuation">(</span><span class="literal string">&quot;</span><span class="literal string escape">\n\n</span><span class="literal string">----- raw info -----</span><span class="literal string escape">\n\n</span><span class="literal string">%s</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span><span class="punctuation">,</span> <span class="name">print_entry</span><span class="punctuation">(</span><span class="name">e</span><span class="punctuation">).</span><span class="name">c_str</span><span class="punctuation">());</span>
@@ -698,7 +754,7 @@ print information about it to std out:</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/extension_protocol.html b/docs/extension_protocol.html
index f3c7cdd85..ce554488a 100644
--- a/docs/extension_protocol.html
+++ b/docs/extension_protocol.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title></title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org Ludvig Strigeus, ludde&#64;utorrent.com" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -490,7 +491,7 @@ message wrapping.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/features.html b/docs/features.html
index edcc57421..142ddf944 100644
--- a/docs/features.html
+++ b/docs/features.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -407,7 +408,7 @@ epoll on linux and kqueue on MacOS X and BSD.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/index.html b/docs/index.html
index b22603126..5c9ad46d2 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title></title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -59,9 +60,8 @@
 <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="http://code.google.com/p/libtorrent/issues/entry">report bugs</a></li>
-<li><a class="reference external" href="http://www.sourceforge.net/projects/libtorrent">sourceforge page</a></li>
+<li><a class="reference external" href="http://sourceforge.net/projects/libtorrent">sourceforge page</a></li>
 <li><a class="reference external" href="http://blog.libtorrent.org">blog</a></li>
-<li><a class="reference external" href="http://code.google.com/p/libtorrent/wiki/index">wiki</a></li>
 </ul>
 <hr class="docutils" />
 <p>Extensions</p>
@@ -105,7 +105,7 @@ the library.</p>
 <h2>Donate</h2>
 <p>Support the development of libtorrent</p>
 <a class="FlattrButton" style="display:none;" href="http://libtorrent.org"></a>
-<noscript><a href="http://flattr.com/thing/95662/libtorrent" target="_blank">
+<noscript><a href="https://flattr.com/thing/95662/libtorrent" target="_blank">
 <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript></div>
 <div class="section" id="feedback">
 <h2>Feedback</h2>
@@ -114,7 +114,7 @@ the library.</p>
 </div>
 <div class="section" id="license">
 <h2>license</h2>
-<p>libtorrent is released under the <a class="reference external" href="http://www.opensource.org/licenses/bsd-license.php">BSD-license</a>.</p>
+<p>libtorrent is released under the <a class="reference external" href="http://opensource.org/licenses/bsd-license.php">BSD-license</a>.</p>
 <p>This means that you can use the library in your project without having to
 release its source code. The only requirement is that you give credit
 to the author of the library by including the libtorrent license in your
@@ -166,7 +166,7 @@ list or posted to the <a class="reference external" href="https://code.google.co
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/projects.html b/docs/projects.html
index fec49a230..922db4b07 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>projects using libtorrent</title>
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -18,6 +18,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -214,7 +215,7 @@ files without needing to leave your computer on.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/python_binding.html b/docs/python_binding.html
index abb2b247f..19e572ed0 100644
--- a/docs/python_binding.html
+++ b/docs/python_binding.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>libtorrent python binding</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -150,7 +151,7 @@ ses.listen_on(6881, 6891)
 e = lt.bdecode(open(&quot;test.torrent&quot;, 'rb').read())
 info = lt.torrent_info(e)
 
-params = { save_path: './', \
+params = { save_path: '.', \
         storage_mode: lt.storage_mode_t.storage_mode_sparse, \
         ti: info }
 h = ses.add_torrent(params)
@@ -200,7 +201,7 @@ while (not h.is_seed()):
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/rst.css b/docs/rst.css
index fb911fd7e..6f523d942 100644
--- a/docs/rst.css
+++ b/docs/rst.css
@@ -1,8 +1,3 @@
-.document {
-    margin-left: 10px;
-    margin-right: 10px;
-}
-
 .document a {
     border: none;
     color: black;
@@ -37,6 +32,9 @@ div.main-toc {
 	column-count: 4;
 	-webkit-column-count: 4;
 	-moz-column-count: 4;
+	column-width: 13em;
+	-webkit-column-width: 13em;
+	-moz-column-width: 13em;
 	border: 1px solid #999;
 	padding: 5px;
 	margin-bottom: 10px;
diff --git a/docs/stats_counters.rst b/docs/stats_counters.rst
index b6c6f864e..7379a4f26 100644
--- a/docs/stats_counters.rst
+++ b/docs/stats_counters.rst
@@ -344,53 +344,53 @@ disconnect peers.
 	<a name="peer.num_peers_up_disk"></a>
 	<a name="peer.num_peers_down_disk"></a>
 
-+---------------------------------------+-------+
-| name                                  | type  |
-+=======================================+=======+
-| peer.num_tcp_peers                    | gauge |
-+---------------------------------------+-------+
-| peer.num_socks5_peers                 | gauge |
-+---------------------------------------+-------+
-| peer.num_http_proxy_peers             | gauge |
-+---------------------------------------+-------+
-| peer.num_utp_peers                    | gauge |
-+---------------------------------------+-------+
-| peer.num_i2p_peers                    | gauge |
-+---------------------------------------+-------+
-| peer.num_ssl_peers                    | gauge |
-+---------------------------------------+-------+
-| peer.num_ssl_socks5_peers             | gauge |
-+---------------------------------------+-------+
-| peer.num_ssl_http_proxy_peers         | gauge |
-+---------------------------------------+-------+
-| peer.num_ssl_utp_peers                | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_half_open              | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_connected              | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_up_interested          | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_down_interested        | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_up_unchoked_all        | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_up_unchoked_optimistic | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_up_unchoked            | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_down_unchoked          | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_up_requests            | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_down_requests          | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_end_game               | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_up_disk                | gauge |
-+---------------------------------------+-------+
-| peer.num_peers_down_disk              | gauge |
-+---------------------------------------+-------+
++---------------------------------------+---------+
+| 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.
@@ -517,13 +517,13 @@ total number of bytes sent and received by the session
 	<a name="net.limiter_up_queue"></a>
 	<a name="net.limiter_down_queue"></a>
 
-+------------------------+-------+
-| name                   | type  |
-+========================+=======+
-| net.limiter_up_queue   | gauge |
-+------------------------+-------+
-| net.limiter_down_queue | gauge |
-+------------------------+-------+
++------------------------+---------+
+| name                   | type    |
++========================+=========+
+| net.limiter_up_queue   | counter |
++------------------------+---------+
+| net.limiter_down_queue | counter |
++------------------------+---------+
 
 
 the number of sockets currently waiting for upload and download
@@ -538,13 +538,13 @@ bandwidht from the rate limiter.
 	<a name="net.limiter_up_bytes"></a>
 	<a name="net.limiter_down_bytes"></a>
 
-+------------------------+-------+
-| name                   | type  |
-+========================+=======+
-| net.limiter_up_bytes   | gauge |
-+------------------------+-------+
-| net.limiter_down_bytes | gauge |
-+------------------------+-------+
++------------------------+---------+
+| 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
@@ -588,11 +588,11 @@ were downloaded multiple times (from different peers)
 
 	<a name="net.has_incoming_connections"></a>
 
-+------------------------------+-------+
-| name                         | type  |
-+==============================+=======+
-| net.has_incoming_connections | gauge |
-+------------------------------+-------+
++------------------------------+---------+
+| name                         | type    |
++==============================+=========+
+| net.has_incoming_connections | counter |
++------------------------------+---------+
 
 
 is false by default and set to true when
@@ -627,25 +627,25 @@ NAT or not.
 	<a name="ses.num_queued_download_torrents"></a>
 	<a name="ses.num_error_torrents"></a>
 
-+----------------------------------+-------+
-| name                             | type  |
-+==================================+=======+
-| ses.num_checking_torrents        | gauge |
-+----------------------------------+-------+
-| ses.num_stopped_torrents         | gauge |
-+----------------------------------+-------+
-| ses.num_upload_only_torrents     | gauge |
-+----------------------------------+-------+
-| ses.num_downloading_torrents     | gauge |
-+----------------------------------+-------+
-| ses.num_seeding_torrents         | gauge |
-+----------------------------------+-------+
-| ses.num_queued_seeding_torrents  | gauge |
-+----------------------------------+-------+
-| ses.num_queued_download_torrents | gauge |
-+----------------------------------+-------+
-| ses.num_error_torrents           | gauge |
-+----------------------------------+-------+
++----------------------------------+---------+
+| 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
@@ -665,13 +665,13 @@ state.
 	<a name="ses.num_loaded_torrents"></a>
 	<a name="ses.num_pinned_torrents"></a>
 
-+-------------------------+-------+
-| name                    | type  |
-+=========================+=======+
-| ses.num_loaded_torrents | gauge |
-+-------------------------+-------+
-| ses.num_pinned_torrents | gauge |
-+-------------------------+-------+
++-------------------------+---------+
+| name                    | type    |
++=========================+=========+
+| ses.num_loaded_torrents | counter |
++-------------------------+---------+
+| ses.num_pinned_torrents | counter |
++-------------------------+---------+
 
 
 the number of torrents that are currently loaded
@@ -733,11 +733,11 @@ is enabled).
 
 	<a name="ses.num_unchoke_slots"></a>
 
-+-----------------------+-------+
-| name                  | type  |
-+=======================+=======+
-| ses.num_unchoke_slots | gauge |
-+-----------------------+-------+
++-----------------------+---------+
+| name                  | type    |
++=======================+=========+
+| ses.num_unchoke_slots | counter |
++-----------------------+---------+
 
 
 the number of allowed unchoked peers
@@ -1087,9 +1087,9 @@ the number of pieces considered while picking pieces
 +---------------------------------------+---------+
 | picker.hash_fail_piece_picks          | counter |
 +---------------------------------------+---------+
-| disk.write_cache_blocks               | gauge   |
+| disk.write_cache_blocks               | counter |
 +---------------------------------------+---------+
-| disk.read_cache_blocks                | gauge   |
+| disk.read_cache_blocks                | counter |
 +---------------------------------------+---------+
 
 
@@ -1132,31 +1132,31 @@ triggered it
 	<a name="disk.num_running_threads"></a>
 	<a name="disk.blocked_disk_jobs"></a>
 
-+----------------------------+-------+
-| name                       | type  |
-+============================+=======+
-| disk.request_latency       | gauge |
-+----------------------------+-------+
-| disk.pinned_blocks         | gauge |
-+----------------------------+-------+
-| disk.disk_blocks_in_use    | gauge |
-+----------------------------+-------+
-| disk.queued_disk_jobs      | gauge |
-+----------------------------+-------+
-| disk.num_running_disk_jobs | gauge |
-+----------------------------+-------+
-| disk.num_read_jobs         | gauge |
-+----------------------------+-------+
-| disk.num_write_jobs        | gauge |
-+----------------------------+-------+
-| disk.num_jobs              | gauge |
-+----------------------------+-------+
-| disk.num_writing_threads   | gauge |
-+----------------------------+-------+
-| disk.num_running_threads   | gauge |
-+----------------------------+-------+
-| disk.blocked_disk_jobs     | gauge |
-+----------------------------+-------+
++----------------------------+---------+
+| 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
@@ -1186,23 +1186,23 @@ peer until we're sending the response back on the socket.
 	<a name="disk.arc_write_size"></a>
 	<a name="disk.arc_volatile_size"></a>
 
-+-------------------------+-------+
-| name                    | type  |
-+=========================+=======+
-| disk.queued_write_bytes | gauge |
-+-------------------------+-------+
-| disk.arc_mru_size       | gauge |
-+-------------------------+-------+
-| disk.arc_mru_ghost_size | gauge |
-+-------------------------+-------+
-| disk.arc_mfu_size       | gauge |
-+-------------------------+-------+
-| disk.arc_mfu_ghost_size | gauge |
-+-------------------------+-------+
-| disk.arc_write_size     | gauge |
-+-------------------------+-------+
-| disk.arc_volatile_size  | gauge |
-+-------------------------+-------+
++-------------------------+---------+
+| 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
@@ -1391,47 +1391,47 @@ as total for all disk jobs. Measured in microseconds
 	<a name="disk.num_fenced_clear_piece"></a>
 	<a name="disk.num_fenced_tick_storage"></a>
 
-+----------------------------------+-------+
-| name                             | type  |
-+==================================+=======+
-| disk.num_fenced_read             | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_write            | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_hash             | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_move_storage     | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_release_files    | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_delete_files     | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_check_fastresume | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_save_resume_data | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_rename_file      | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_stop_torrent     | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_cache_piece      | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_flush_piece      | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_flush_hashed     | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_flush_storage    | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_trim_cache       | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_file_priority    | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_load_torrent     | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_clear_piece      | gauge |
-+----------------------------------+-------+
-| disk.num_fenced_tick_storage     | gauge |
-+----------------------------------+-------+
++----------------------------------+---------+
+| 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
@@ -1443,11 +1443,11 @@ are currently blocked by a disk fence
 
 	<a name="dht.dht_nodes"></a>
 
-+---------------+-------+
-| name          | type  |
-+===============+=======+
-| dht.dht_nodes | gauge |
-+---------------+-------+
++---------------+---------+
+| name          | type    |
++===============+=========+
+| dht.dht_nodes | counter |
++---------------+---------+
 
 
 The number of nodes in the DHT routing table
@@ -1458,11 +1458,11 @@ The number of nodes in the DHT routing table
 
 	<a name="dht.dht_node_cache"></a>
 
-+--------------------+-------+
-| name               | type  |
-+====================+=======+
-| dht.dht_node_cache | gauge |
-+--------------------+-------+
++--------------------+---------+
+| name               | type    |
++====================+=========+
+| dht.dht_node_cache | counter |
++--------------------+---------+
 
 
 The number of replacement nodes in the DHT routing table
@@ -1473,11 +1473,11 @@ The number of replacement nodes in the DHT routing table
 
 	<a name="dht.dht_torrents"></a>
 
-+------------------+-------+
-| name             | type  |
-+==================+=======+
-| dht.dht_torrents | gauge |
-+------------------+-------+
++------------------+---------+
+| name             | type    |
++==================+=========+
+| dht.dht_torrents | counter |
++------------------+---------+
 
 
 the number of torrents currently tracked by our DHT node
@@ -1488,11 +1488,11 @@ the number of torrents currently tracked by our DHT node
 
 	<a name="dht.dht_peers"></a>
 
-+---------------+-------+
-| name          | type  |
-+===============+=======+
-| dht.dht_peers | gauge |
-+---------------+-------+
++---------------+---------+
+| name          | type    |
++===============+=========+
+| dht.dht_peers | counter |
++---------------+---------+
 
 
 the number of peers currently tracked by our DHT node
@@ -1503,11 +1503,11 @@ the number of peers currently tracked by our DHT node
 
 	<a name="dht.dht_immutable_data"></a>
 
-+------------------------+-------+
-| name                   | type  |
-+========================+=======+
-| dht.dht_immutable_data | gauge |
-+------------------------+-------+
++------------------------+---------+
+| name                   | type    |
++========================+=========+
+| dht.dht_immutable_data | counter |
++------------------------+---------+
 
 
 the number of immutable data items tracked by our DHT node
@@ -1518,11 +1518,11 @@ the number of immutable data items tracked by our DHT node
 
 	<a name="dht.dht_mutable_data"></a>
 
-+----------------------+-------+
-| name                 | type  |
-+======================+=======+
-| dht.dht_mutable_data | gauge |
-+----------------------+-------+
++----------------------+---------+
+| name                 | type    |
++======================+=========+
+| dht.dht_mutable_data | counter |
++----------------------+---------+
 
 
 the number of mutable data items tracked by our DHT node
@@ -1533,11 +1533,11 @@ the number of mutable data items tracked by our DHT node
 
 	<a name="dht.dht_allocated_observers"></a>
 
-+-----------------------------+-------+
-| name                        | type  |
-+=============================+=======+
-| dht.dht_allocated_observers | gauge |
-+-----------------------------+-------+
++-----------------------------+---------+
+| name                        | type    |
++=============================+=========+
+| dht.dht_allocated_observers | counter |
++-----------------------------+---------+
 
 
 the number of RPC observers currently allocated
@@ -1788,19 +1788,19 @@ has occurred.
 	<a name="utp.num_utp_fin_sent"></a>
 	<a name="utp.num_utp_close_wait"></a>
 
-+------------------------+-------+
-| name                   | type  |
-+========================+=======+
-| utp.num_utp_idle       | gauge |
-+------------------------+-------+
-| utp.num_utp_syn_sent   | gauge |
-+------------------------+-------+
-| utp.num_utp_connected  | gauge |
-+------------------------+-------+
-| utp.num_utp_fin_sent   | gauge |
-+------------------------+-------+
-| utp.num_utp_close_wait | gauge |
-+------------------------+-------+
++------------------------+---------+
+| 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
diff --git a/docs/style.css b/docs/style.css
index 4e50f5399..ce03d34eb 100644
--- a/docs/style.css
+++ b/docs/style.css
@@ -41,7 +41,7 @@ a {
 
 ul, ol { line-height: 1.8em; }
 ul { list-style: square; }
-li { margin-left: 2.8em; font-size: 92%; }
+li { margin-left: 2.8em; }
 
 p, ul, ol, img {margin-bottom: 1em;}
 
@@ -66,9 +66,10 @@ div.section p, div.section ul, div.section dl {
 
 #container {
     text-align: left;
-    width: 65em;
-    margin: 0 auto;
+    max-width: 65em;
+    margin: 5px auto;
     position: relative;
+    padding: 3px ;
 }
 
 #header {
diff --git a/docs/template.txt b/docs/template.txt
index 6691655a1..417d84a8f 100644
--- a/docs/template.txt
+++ b/docs/template.txt
@@ -1,6 +1,6 @@
 %(head_prefix)s
 %(head)s
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -13,6 +13,7 @@
 /* ]]> */
 </script>
 %(stylesheet)s
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%%; }
diff --git a/docs/template2.txt b/docs/template2.txt
index af9168c2f..d97ffcdbf 100644
--- a/docs/template2.txt
+++ b/docs/template2.txt
@@ -1,6 +1,6 @@
 %(head_prefix)s
 %(head)s
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -13,6 +13,7 @@
 /* ]]> */
 </script>
 %(stylesheet)s
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%%; }
diff --git a/docs/todo.html b/docs/todo.html
index 8dab3a16a..d58db29c9 100644
--- a/docs/todo.html
+++ b/docs/todo.html
@@ -23,9 +23,9 @@
 <h1>libtorrent todo-list</h1>
 <span style="color: #f00">0 urgent</span>
 <span style="color: #f77">6 important</span>
-<span style="color: #3c3">50 relevant</span>
+<span style="color: #3c3">52 relevant</span>
 <span style="color: #77f">9 feasible</span>
-<span style="color: #999">165 notes</span>
+<span style="color: #999">164 notes</span>
 <table width="100%" border="1" style="border-collapse: collapse;"><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(0)">../src/file.cpp:481</a></td><td>find out what error code is reported when the filesystem does not support hard links.</td></tr><tr id="0" style="display: none;" colspan="3"><td colspan="3"><h2>find out what error code is reported when the filesystem
 does not support hard links.</h2><h4>../src/file.cpp:481</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
 #ifdef TORRENT_WINDOWS
@@ -120,9 +120,84 @@ void upnp::start(void* state)
 	if (state)
 	{
 		upnp_state_t* s = (upnp_state_t*)state;
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(2)">../src/kademlia/get_item.cpp:220</a></td><td>we don't support CAS errors here! we need a custom observer</td></tr><tr id="2" style="display: none;" colspan="3"><td colspan="3"><h2>we don't support CAS errors here! we need a custom observer</h2><h4>../src/kademlia/get_item.cpp:220</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TORRENT_LOG(node) &lt;&lt; "sending put [ v: \"" &lt;&lt; m_data.value()
-		&lt;&lt; "\" seq: " &lt;&lt; (m_data.is_mutable() ? m_data.seq() : -1)
-		&lt;&lt; " nodes: " &lt;&lt; v.size() &lt;&lt; " ]" ;
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(2)">../src/kademlia/dht_tracker.cpp:521</a></td><td>it would be nice to not have to decode this if logging is not enabled. Maybe there could be a separate log function for incoming and outgoing packets.</td></tr><tr id="2" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to not have to decode this if logging
+is not enabled. Maybe there could be a separate log function for
+incoming and outgoing packets.</h2><h4>../src/kademlia/dht_tracker.cpp:521</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+	bool dht_tracker::has_quota()
+	{
+		return m_sock.has_quota();
+	}
+
+	bool dht_tracker::send_packet(libtorrent::entry&amp; e, udp::endpoint const&amp; addr, int send_flags)
+	{
+		using libtorrent::bencode;
+		using libtorrent::entry;
+
+		static char const version_str[] = {'L', 'T'
+			, LIBTORRENT_VERSION_MAJOR, LIBTORRENT_VERSION_MINOR};
+		e["v"] = std::string(version_str, version_str + 4);
+
+		m_send_buf.clear();
+		bencode(std::back_inserter(m_send_buf), e);
+		error_code ec;
+
+#ifdef TORRENT_DHT_VERBOSE_LOGGING
+<div style="background: #ffff00" width="100%">		bdecode_node print;
+</div>		int ret = bdecode(&amp;m_send_buf[0], &amp;m_send_buf[0] + m_send_buf.size(), print, ec);
+		TORRENT_ASSERT(ret == 0);
+		std::string outgoing_message = print_entry(print, true);
+#endif
+
+		if (m_sock.send(addr, &amp;m_send_buf[0], (int)m_send_buf.size(), ec, send_flags))
+		{
+			if (ec)
+			{
+				m_counters.inc_stats_counter(counters::dht_messages_out_dropped);
+#ifdef TORRENT_DHT_VERBOSE_LOGGING
+				m_log-&gt;log(dht_logger::tracker, "==&gt; %s DROPPED (%s) %s"
+					, print_endpoint(addr).c_str(), ec.message().c_str()
+					, outgoing_message.c_str());
+#endif
+				return false;
+			}
+
+			m_counters.inc_stats_counter(counters::dht_bytes_out, m_send_buf.size());
+			// account for IP and UDP overhead
+			m_counters.inc_stats_counter(counters::sent_ip_overhead_bytes
+				, addr.address().is_v6() ? 48 : 28);
+			m_counters.inc_stats_counter(counters::dht_messages_out);
+#ifdef TORRENT_DHT_VERBOSE_LOGGING
+			m_log-&gt;log(dht_logger::tracker, "==&gt; %s %s"
+				, print_endpoint(addr).c_str()
+				, outgoing_message.c_str());
+#endif
+			return true;
+		}
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(3)">../src/kademlia/get_item.cpp:202</a></td><td>it would be nice to not have to spend so much time rendering the bencoded dict if logging is disabled</td></tr><tr id="3" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to not have to spend so much time rendering
+the bencoded dict if logging is disabled</h2><h4>../src/kademlia/get_item.cpp:202</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				bencode(std::back_inserter(buffer), m_data.value());
+				TORRENT_ASSERT(m_target == hasher(&amp;buffer[0], buffer.size()).final());
+			}
+#endif
+
+			// this function is called when we're done, passing
+			// in all relevant nodes we received data from close
+			// to the target.
+			m_nodes_callback = boost::bind(&amp;get_item::put, this, _1);
+		}
+	}
+	find_data::done();
+}
+
+// this function sends a put message to the nodes
+// closest to the target. Those nodes are passed in
+// as the v argument
+void get_item::put(std::vector&lt;std::pair&lt;node_entry, std::string&gt; &gt; const&amp; v)
+{
+#ifdef TORRENT_DHT_VERBOSE_LOGGING
+<div style="background: #ffff00" width="100%">	get_node().observer()-&gt;log(dht_logger::traversal, "[%p] sending put [ v: \"%s\" seq: %" PRId64 " nodes: %d ]"
+</div>		, this, m_data.value().to_string().c_str()
+		, (m_data.is_mutable() ? m_data.seq() : -1)
+		, int(v.size()));
 #endif
 
 	// create a dummy traversal_algorithm
@@ -134,7 +209,28 @@ void upnp::start(void* state)
 		, end(v.end()); i != end; ++i)
 	{
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
-		TORRENT_LOG(node) &lt;&lt; "  put-distance: " &lt;&lt; (160 - distance_exp(m_target, i-&gt;first.id));
+		get_node().observer()-&gt;log(dht_logger::traversal, "[%p] put-distance: %d"
+			, this, 160 - distance_exp(m_target, i-&gt;first.id));
+#endif
+
+		void* ptr = m_node.m_rpc.allocate_observer();
+		if (ptr == 0) return;
+
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(4)">../src/kademlia/get_item.cpp:226</a></td><td>we don't support CAS errors here! we need a custom observer</td></tr><tr id="4" style="display: none;" colspan="3"><td colspan="3"><h2>we don't support CAS errors here! we need a custom observer</h2><h4>../src/kademlia/get_item.cpp:226</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		, (m_data.is_mutable() ? m_data.seq() : -1)
+		, int(v.size()));
+#endif
+
+	// create a dummy traversal_algorithm
+	boost::intrusive_ptr&lt;traversal_algorithm&gt; algo(
+		new traversal_algorithm(m_node, (node_id::min)()));
+
+	// store on the first k nodes
+	for (std::vector&lt;std::pair&lt;node_entry, std::string&gt; &gt;::const_iterator i = v.begin()
+		, end(v.end()); i != end; ++i)
+	{
+#ifdef TORRENT_DHT_VERBOSE_LOGGING
+		get_node().observer()-&gt;log(dht_logger::traversal, "[%p] put-distance: %d"
+			, this, 160 - distance_exp(m_target, i-&gt;first.id));
 #endif
 
 		void* ptr = m_node.m_rpc.allocate_observer();
@@ -171,126 +267,58 @@ void get_item_observer::reply(msg const&amp; m)
 	boost::uint64_t seq = 0;
 
 	bdecode_node r = m.message.dict_find_dict("r");
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(3)">../src/kademlia/logging.cpp:38</a></td><td>replace this logging with alerts</td></tr><tr id="3" style="display: none;" colspan="3"><td colspan="3"><h2>replace this logging with alerts</h2><h4>../src/kademlia/logging.cpp:38</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
-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/kademlia/logging.hpp"
-#include "libtorrent/time.hpp"
-
-namespace libtorrent { namespace dht
-{
-<div style="background: #ffff00" width="100%">	log_event::log_event(log&amp; log) 
-</div>		: log_(log) 
-	{
-		if (!log_.enabled()) return;
-
-		static const time_point start = clock_type::now();
-		char ret[200];
-		snprintf(ret, sizeof(ret), "%" PRId64
-			, total_microseconds(clock_type::now() - start));
-		log_ &lt;&lt; ret &lt;&lt; " [" &lt;&lt; log.id() &lt;&lt; "] ";
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(5)">../src/kademlia/traversal_algorithm.cpp:357</a></td><td>it would be nice to not have to perform this loop if logging is disabled</td></tr><tr id="5" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to not have to perform this loop if
+logging is disabled</h2><h4>../src/kademlia/traversal_algorithm.cpp:357</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		++m_timeouts;
+		TORRENT_ASSERT(m_invoke_count &gt; 0);
+		--m_invoke_count;
 	}
 
-	log_event::~log_event()
+	if (flags &amp; prevent_request)
 	{
-		if (log_.enabled())
+		--m_branch_factor;
+		if (m_branch_factor &lt;= 0) m_branch_factor = 1;
+	}
+	bool is_done = add_requests();
+	if (is_done) done();
+}
+
+void traversal_algorithm::done()
+{
+#ifdef TORRENT_DHT_VERBOSE_LOGGING
+	int results_target = m_node.m_table.bucket_size();
+	int closest_target = 160;
+
+<div style="background: #ffff00" width="100%">	for (std::vector&lt;observer_ptr&gt;::iterator i = m_results.begin()
+</div>		, end(m_results.end()); i != end &amp;&amp; results_target &gt; 0; ++i)
+	{
+		boost::intrusive_ptr&lt;observer&gt; o = *i;
+		if (o-&gt;flags &amp; observer::flag_alive)
 		{
-			log_ &lt;&lt; "\n";
-			log_.flush();
+			TORRENT_ASSERT(o-&gt;flags &amp; observer::flag_queried);
+			char hex_id[41];
+			to_hex(reinterpret_cast&lt;char const*&gt;(&amp;o-&gt;id()[0]), 20, hex_id);
+			get_node().observer()-&gt;log(dht_logger::traversal
+				, "[%p] id: %s distance: %d addr: %s"
+				, this, hex_id, closest_target
+				, print_endpoint(o-&gt;target_ep()).c_str());
+
+			--results_target;
+			int dist = distance_exp(m_target, o-&gt;id());
+			if (dist &lt; closest_target) closest_target = dist;
 		}
 	}
 
-}}
-
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(4)">../include/libtorrent/http_tracker_connection.hpp:105</a></td><td>add a unit test for this function</td></tr><tr id="4" style="display: none;" colspan="3"><td colspan="3"><h2>add a unit test for this function</h2><h4>../include/libtorrent/http_tracker_connection.hpp:105</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
-		void on_filter(http_connection&amp; c, std::vector&lt;tcp::endpoint&gt;&amp; endpoints);
-		void on_connect(http_connection&amp; c);
-		void on_response(error_code const&amp; ec, http_parser const&amp; parser
-			, char const* data, int size);
-
-		virtual void on_timeout(error_code const&amp;) {}
-
-		tracker_manager&amp; m_man;
-		boost::shared_ptr&lt;http_connection&gt; m_tracker_connection;
-		address m_tracker_ip;
-#if TORRENT_USE_I2P
-		i2p_connection* m_i2p_conn;
+	get_node().observer()-&gt;log(dht_logger::traversal
+		, "[%p] COMPLETED distance: %d type: %s"
+		, this, closest_target, name());
 #endif
-	};
-
-	TORRENT_EXTRA_EXPORT tracker_response parse_tracker_response(
-		char const* data, int size, error_code&amp; ec
-		, bool scrape_request, sha1_hash scrape_ih);
-
-<div style="background: #ffff00" width="100%">	TORRENT_EXTRA_EXPORT bool extract_peer_info(bdecode_node const&amp; info
-</div>		, peer_entry&amp; ret, error_code&amp; ec);
+	// delete all our references to the observer objects so
+	// they will in turn release the traversal algorithm
+	m_results.clear();
 }
 
-#endif // TORRENT_HTTP_TRACKER_CONNECTION_HPP_INCLUDED
-
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(5)">../include/libtorrent/kademlia/node.hpp:200</a></td><td>rename this to just node</td></tr><tr id="5" style="display: none;" colspan="3"><td colspan="3"><h2>rename this to just node</h2><h4>../include/libtorrent/kademlia/node.hpp:200</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
-struct count_peers
+bool traversal_algorithm::add_requests()
 {
-	int&amp; count;
-	count_peers(int&amp; c): count(c) {}
-	void operator()(std::pair&lt;libtorrent::dht::node_id
-		, libtorrent::dht::torrent_entry&gt; const&amp; t)
-	{
-		count += t.second.peers.size();
-	}
-};
-
-struct udp_socket_interface
-{
-	virtual bool has_quota() = 0;
-	virtual bool send_packet(entry&amp; e, udp::endpoint const&amp; addr, int flags) = 0;
-protected:
-	~udp_socket_interface() {}
-};
-
-<div style="background: #ffff00" width="100%">class TORRENT_EXTRA_EXPORT node : boost::noncopyable
-</div>{
-typedef std::map&lt;node_id, torrent_entry&gt; table_t;
-typedef std::map&lt;node_id, dht_immutable_item&gt; dht_immutable_table_t;
-typedef std::map&lt;node_id, dht_mutable_item&gt; dht_mutable_table_t;
-
-public:
-	node(udp_socket_interface* sock
-		, libtorrent::dht_settings const&amp; settings, node_id nid
-		, dht_observer* observer, counters&amp; cnt);
-
-	virtual ~node() {}
-
-	void tick();
-	void bootstrap(std::vector&lt;udp::endpoint&gt; const&amp; nodes
-		, find_data::nodes_callback const&amp; f);
-	void add_router_node(udp::endpoint router);
-		
-	void unreachable(udp::endpoint const&amp; ep);
-	void incoming(msg const&amp; m);
-
-	int num_torrents() const { return m_map.size(); }
-	int num_peers() const
-	{
-		int ret = 0;
-		std::for_each(m_map.begin(), m_map.end(), count_peers(ret));
-		return ret;
-	}
-
-	int bucket_size(int bucket);
-
 </pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(6)">../src/alert.cpp:1444</a></td><td>the salt here is allocated on the heap. It would be nice to allocate in in the stack_allocator</td></tr><tr id="6" style="display: none;" colspan="3"><td colspan="3"><h2>the salt here is allocated on the heap. It would be nice to
 allocate in in the stack_allocator</h2><h4>../src/alert.cpp:1444</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			, operation_names[op]
 			, error.value()
@@ -551,10 +579,62 @@ returns
 			create_directory(new_path, ec);
 			if (ec) return;
 			for (directory i(old_path, ec); !i.done(); i.next(ec))
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(11)">../src/peer_connection.cpp:2338</a></td><td>this should probably be based on time instead of number of request messages. For a very high throughput connection, 300 may be a legitimate number of requests to have in flight when getting choked</td></tr><tr id="11" style="display: none;" colspan="3"><td colspan="3"><h2>this should probably be based on time instead of number
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(11)">../src/http_tracker_connection.cpp:379</a></td><td>returning a bool here is redundant. Instead this function should return the peer_entry</td></tr><tr id="11" style="display: none;" colspan="3"><td colspan="3"><h2>returning a bool here is redundant. Instead this function should
+return the peer_entry</h2><h4>../src/http_tracker_connection.cpp:379</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
+			std::list&lt;address&gt; ip_list;
+			if (m_tracker_connection)
+			{
+				error_code ec;
+				ip_list.push_back(
+					m_tracker_connection-&gt;socket().remote_endpoint(ec).address());
+				std::vector&lt;tcp::endpoint&gt; const&amp; epts = m_tracker_connection-&gt;endpoints();
+				for (std::vector&lt;tcp::endpoint&gt;::const_iterator i = epts.begin()
+					, end(epts.end()); i != end; ++i)
+				{
+					ip_list.push_back(i-&gt;address());
+				}
+			}
+
+			cb-&gt;tracker_response(tracker_req(), m_tracker_ip, ip_list, resp);
+		}
+		close();
+	}
+
+<div style="background: #ffff00" width="100%">	bool extract_peer_info(bdecode_node const&amp; info, peer_entry&amp; ret, error_code&amp; ec)
+</div>	{
+		// extract peer id (if any)
+		if (info.type() != bdecode_node::dict_t)
+		{
+			ec.assign(errors::invalid_peer_dict, get_libtorrent_category());
+			return false;
+		}
+		bdecode_node i = info.dict_find_string("peer id");
+		if (i &amp;&amp; i.string_length() == 20)
+		{
+			std::copy(i.string_ptr(), i.string_ptr()+20, ret.pid.begin());
+		}
+		else
+		{
+			// if there's no peer_id, just initialize it to a bunch of zeroes
+			std::fill_n(ret.pid.begin(), 20, 0);
+		}
+
+		// extract ip
+		i = info.dict_find_string("ip");
+		if (i == 0)
+		{
+			ec.assign(errors::invalid_tracker_response, get_libtorrent_category());
+			return false;
+		}
+		ret.hostname = i.string_value();
+
+		// extract port
+		i = info.dict_find_int("port");
+		if (i == 0)
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(12)">../src/peer_connection.cpp:2336</a></td><td>this should probably be based on time instead of number of request messages. For a very high throughput connection, 300 may be a legitimate number of requests to have in flight when getting choked</td></tr><tr id="12" style="display: none;" colspan="3"><td colspan="3"><h2>this should probably be based on time instead of number
 of request messages. For a very high throughput connection, 300
 may be a legitimate number of requests to have in flight when
-getting choked</h2><h4>../src/peer_connection.cpp:2338</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				, "piece: %d s: %d l: %d invalid request"
+getting choked</h2><h4>../src/peer_connection.cpp:2336</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				, "piece: %d s: %d l: %d invalid request"
 				, r.piece , r.start , r.length);
 #endif
 
@@ -605,11 +685,11 @@ getting choked</h2><h4>../src/peer_connection.cpp:2338</h4><pre style="backgroun
 		}
 
 		if (m_choked &amp;&amp; fast_idx == -1)
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(12)">../src/peer_connection.cpp:3045</a></td><td>since we throw away the queue entry once we issue the disk job, this may happen. Instead, we should keep the queue entry around, mark it as having been requested from disk and once the disk job comes back, discard it if it has been cancelled. Maybe even be able to cancel disk jobs?</td></tr><tr id="12" style="display: none;" colspan="3"><td colspan="3"><h2>since we throw away the queue entry once we issue
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(13)">../src/peer_connection.cpp:3043</a></td><td>since we throw away the queue entry once we issue the disk job, this may happen. Instead, we should keep the queue entry around, mark it as having been requested from disk and once the disk job comes back, discard it if it has been cancelled. Maybe even be able to cancel disk jobs?</td></tr><tr id="13" style="display: none;" colspan="3"><td colspan="3"><h2>since we throw away the queue entry once we issue
 the disk job, this may happen. Instead, we should keep the
 queue entry around, mark it as having been requested from
 disk and once the disk job comes back, discard it if it has
-been cancelled. Maybe even be able to cancel disk jobs?</h2><h4>../src/peer_connection.cpp:3045</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+been cancelled. Maybe even be able to cancel disk jobs?</h2><h4>../src/peer_connection.cpp:3043</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		std::vector&lt;peer_request&gt;::iterator i
 			= std::find(m_requests.begin(), m_requests.end(), r);
 
@@ -660,10 +740,10 @@ been cancelled. Maybe even be able to cancel disk jobs?</h2><h4>../src/peer_conn
 	void peer_connection::incoming_have_all()
 	{
 		TORRENT_ASSERT(is_single_thread());
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(13)">../src/peer_connection.cpp:4695</a></td><td>use a deadline_timer for timeouts. Don't rely on second_tick()! Hook this up to connect timeout as well. This would improve performance because of less work in second_tick(), and might let use remove ticking entirely eventually</td></tr><tr id="13" style="display: none;" colspan="3"><td colspan="3"><h2>use a deadline_timer for timeouts. Don't rely on second_tick()!
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(14)">../src/peer_connection.cpp:4693</a></td><td>use a deadline_timer for timeouts. Don't rely on second_tick()! Hook this up to connect timeout as well. This would improve performance because of less work in second_tick(), and might let use remove ticking entirely eventually</td></tr><tr id="14" style="display: none;" colspan="3"><td colspan="3"><h2>use a deadline_timer for timeouts. Don't rely on second_tick()!
 Hook this up to connect timeout as well. This would improve performance
 because of less work in second_tick(), and might let use remove ticking
-entirely eventually</h2><h4>../src/peer_connection.cpp:4695</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				connect_timeout += 20;
+entirely eventually</h2><h4>../src/peer_connection.cpp:4693</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				connect_timeout += 20;
 #endif
 
 			if (d &gt; seconds(connect_timeout)
@@ -714,7 +794,7 @@ entirely eventually</h2><h4>../src/peer_connection.cpp:4695</h4><pre style="back
 		d = now - (std::max)(m_last_unchoke, m_last_incoming_request);
 		if (may_timeout
 			&amp;&amp; !m_connecting
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(14)">../src/peer_list.cpp:495</a></td><td>it would be nice if there was a way to iterate over these torrent_peer objects in the order they are allocated in the pool instead. It would probably be more efficient</td></tr><tr id="14" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice if there was a way to iterate over these
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(15)">../src/peer_list.cpp:495</a></td><td>it would be nice if there was a way to iterate over these torrent_peer objects in the order they are allocated in the pool instead. It would probably be more efficient</td></tr><tr id="15" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice if there was a way to iterate over these
 torrent_peer objects in the order they are allocated in the pool
 instead. It would probably be more efficient</h2><h4>../src/peer_list.cpp:495</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		, int session_time, torrent_state* state)
 	{
@@ -767,7 +847,7 @@ instead. It would probably be more efficient</h2><h4>../src/peer_list.cpp:495</h
 					{
 						erase_candidate = current;
 					}
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(15)">../src/piece_picker.cpp:1996</a></td><td>make the 2048 limit configurable</td></tr><tr id="15" style="display: none;" colspan="3"><td colspan="3"><h2>make the 2048 limit configurable</h2><h4>../src/piece_picker.cpp:1996</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// only one of rarest_first or sequential can be set
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(16)">../src/piece_picker.cpp:1996</a></td><td>make the 2048 limit configurable</td></tr><tr id="16" style="display: none;" colspan="3"><td colspan="3"><h2>make the 2048 limit configurable</h2><h4>../src/piece_picker.cpp:1996</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// only one of rarest_first or sequential can be set
 
 	void piece_picker::pick_pieces(bitfield const&amp; pieces
 		, std::vector&lt;piece_block&gt;&amp; interesting_blocks, int num_blocks
@@ -818,7 +898,7 @@ instead. It would probably be more efficient</h2><h4>../src/peer_list.cpp:495</h
 		const std::vector&lt;int&gt; empty_vector;
 	
 		// When prefer_contiguous_blocks is set (usually set when downloading from
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(16)">../src/piece_picker.cpp:2605</a></td><td>the first_block returned here is the largest free range, not the first-fit range, which would be better</td></tr><tr id="16" style="display: none;" colspan="3"><td colspan="3"><h2>the first_block returned here is the largest free range, not
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(17)">../src/piece_picker.cpp:2605</a></td><td>the first_block returned here is the largest free range, not the first-fit range, which would be better</td></tr><tr id="17" style="display: none;" colspan="3"><td colspan="3"><h2>the first_block returned here is the largest free range, not
 the first-fit range, which would be better</h2><h4>../src/piece_picker.cpp:2605</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			, end(m_block_info.end()); i != end; ++i)
 		{
 			TORRENT_ASSERT(i-&gt;peer == 0 || static_cast&lt;torrent_peer*&gt;(i-&gt;peer)-&gt;in_use);
@@ -870,7 +950,7 @@ the first-fit range, which would be better</h2><h4>../src/piece_picker.cpp:2605<
 				exclusive = false;
 				if (info.state == piece_picker::block_info::state_requested
 					&amp;&amp; info.peer != 0)
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(17)">../src/piece_picker.cpp:3390</a></td><td>it would be nice if this could be folded into lock_piece() the main distinction is that this also maintains the m_num_passed counter and the passed_hash_check member Is there ever a case where we call write filed without also locking the piece? Perhaps write_failed() should imply locking it.</td></tr><tr id="17" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice if this could be folded into lock_piece()
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(18)">../src/piece_picker.cpp:3390</a></td><td>it would be nice if this could be folded into lock_piece() the main distinction is that this also maintains the m_num_passed counter and the passed_hash_check member Is there ever a case where we call write filed without also locking the piece? Perhaps write_failed() should imply locking it.</td></tr><tr id="18" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice if this could be folded into lock_piece()
 the main distinction is that this also maintains the m_num_passed
 counter and the passed_hash_check member
 Is there ever a case where we call write filed without also locking
@@ -925,7 +1005,7 @@ the piece? Perhaps write_failed() should imply locking it.</h2><h4>../src/piece_
 		if (info.state == block_info::state_finished) return;
 		if (info.state == block_info::state_writing) --i-&gt;writing;
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(18)">../src/session_impl.cpp:214</a></td><td>find a better place for this function</td></tr><tr id="18" style="display: none;" colspan="3"><td colspan="3"><h2>find a better place for this function</h2><h4>../src/session_impl.cpp:214</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			*j.vec, j.peer-&gt;make_write_handler(boost::bind(
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(19)">../src/session_impl.cpp:214</a></td><td>find a better place for this function</td></tr><tr id="19" style="display: none;" colspan="3"><td colspan="3"><h2>find a better place for this function</h2><h4>../src/session_impl.cpp:214</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			*j.vec, j.peer-&gt;make_write_handler(boost::bind(
 				&amp;peer_connection::on_send_data, j.peer, _1, _2)));
 	}
 	else
@@ -976,7 +1056,7 @@ namespace aux {
 		static const class_mapping v4_classes[] =
 		{
 			// everything
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(19)">../src/session_impl.cpp:821</a></td><td>if the DHT is enabled, it should probably be restarted here. maybe it should even be deferred to not be started until the client has had a chance to pass in the dht state</td></tr><tr id="19" style="display: none;" colspan="3"><td colspan="3"><h2>if the DHT is enabled, it should probably be restarted here.
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(20)">../src/session_impl.cpp:821</a></td><td>if the DHT is enabled, it should probably be restarted here. maybe it should even be deferred to not be started until the client has had a chance to pass in the dht state</td></tr><tr id="20" style="display: none;" colspan="3"><td colspan="3"><h2>if the DHT is enabled, it should probably be restarted here.
 maybe it should even be deferred to not be started until the client
 has had a chance to pass in the dht state</h2><h4>../src/session_impl.cpp:821</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (val) m_settings.set_int(settings_pack::allowed_enc_level, val.int_value());
 		}
@@ -1029,7 +1109,7 @@ has had a chance to pass in the dht state</h2><h4>../src/session_impl.cpp:821</h
 		}
 #endif
 	}
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(20)">../src/session_impl.cpp:1817</a></td><td>the udp socket(s) should be using the same generic mechanism and not be restricted to a single one we should open a one listen socket for each entry in the listen_interfaces list</td></tr><tr id="20" style="display: none;" colspan="3"><td colspan="3"><h2>the udp socket(s) should be using the same generic
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(21)">../src/session_impl.cpp:1817</a></td><td>the udp socket(s) should be using the same generic mechanism and not be restricted to a single one we should open a one listen socket for each entry in the listen_interfaces list</td></tr><tr id="21" style="display: none;" colspan="3"><td colspan="3"><h2>the udp socket(s) should be using the same generic
 mechanism and not be restricted to a single one
 we should open a one listen socket for each entry in the
 listen_interfaces list</h2><h4>../src/session_impl.cpp:1817</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				}
@@ -1083,7 +1163,7 @@ listen_interfaces list</h2><h4>../src/session_impl.cpp:1817</h4><pre style="back
 					if (s.sock)
 					{
 						TORRENT_ASSERT(!m_abort);
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(21)">../src/session_impl.cpp:1919</a></td><td>use bind_to_device in udp_socket</td></tr><tr id="21" style="display: none;" colspan="3"><td colspan="3"><h2>use bind_to_device in udp_socket</h2><h4>../src/session_impl.cpp:1919</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (m_listen_port_retries &gt; 0)
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(22)">../src/session_impl.cpp:1919</a></td><td>use bind_to_device in udp_socket</td></tr><tr id="22" style="display: none;" colspan="3"><td colspan="3"><h2>use bind_to_device in udp_socket</h2><h4>../src/session_impl.cpp:1919</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (m_listen_port_retries &gt; 0)
 			{
 				m_listen_interface.port(m_listen_interface.port() + 1);
 				--m_listen_port_retries;
@@ -1128,7 +1208,7 @@ listen_interfaces list</h2><h4>../src/session_impl.cpp:1817</h4><pre style="back
 		}
 #endif // TORRENT_USE_OPENSSL
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(22)">../src/session_impl.cpp:1945</a></td><td>use bind_to_device in udp_socket</td></tr><tr id="22" style="display: none;" colspan="3"><td colspan="3"><h2>use bind_to_device in udp_socket</h2><h4>../src/session_impl.cpp:1945</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					, print_endpoint(m_listen_interface).c_str(), ec.message().c_str());
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(23)">../src/session_impl.cpp:1945</a></td><td>use bind_to_device in udp_socket</td></tr><tr id="23" style="display: none;" colspan="3"><td colspan="3"><h2>use bind_to_device in udp_socket</h2><h4>../src/session_impl.cpp:1945</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					, print_endpoint(m_listen_interface).c_str(), ec.message().c_str());
 #endif
 				if (m_alerts.should_post&lt;listen_failed_alert&gt;())
 				{
@@ -1179,7 +1259,7 @@ listen_interfaces list</h2><h4>../src/session_impl.cpp:1817</h4><pre style="back
 		}
 
 		if (m_settings.get_int(settings_pack::peer_tos) != 0)
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(23)">../src/session_impl.cpp:3391</a></td><td>make a list for torrents that want to be announced on the DHT so we don't have to loop over all torrents, just to find the ones that want to announce</td></tr><tr id="23" style="display: none;" colspan="3"><td colspan="3"><h2>make a list for torrents that want to be announced on the DHT so we
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(24)">../src/session_impl.cpp:3391</a></td><td>make a list for torrents that want to be announced on the DHT so we don't have to loop over all torrents, just to find the ones that want to announce</td></tr><tr id="24" style="display: none;" colspan="3"><td colspan="3"><h2>make a list for torrents that want to be announced on the DHT so we
 don't have to loop over all torrents, just to find the ones that want to announce</h2><h4>../src/session_impl.cpp:3391</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (!m_dht_torrents.empty())
 		{
 			boost::shared_ptr&lt;torrent&gt; t;
@@ -1231,7 +1311,7 @@ don't have to loop over all torrents, just to find the ones that want to announc
 		if (m_torrents.empty()) return;
 
 		if (m_next_lsd_torrent == m_torrents.end())
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(24)">../src/storage.cpp:921</a></td><td>is this risky? The upper layer will assume we have the whole file. Perhaps we should verify that at least the size of the file is correct</td></tr><tr id="24" style="display: none;" colspan="3"><td colspan="3"><h2>is this risky? The upper layer will assume we have the
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(25)">../src/storage.cpp:921</a></td><td>is this risky? The upper layer will assume we have the whole file. Perhaps we should verify that at least the size of the file is correct</td></tr><tr id="25" style="display: none;" colspan="3"><td colspan="3"><h2>is this risky? The upper layer will assume we have the
 whole file. Perhaps we should verify that at least the size
 of the file is correct</h2><h4>../src/storage.cpp:921</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (links)
 		{
@@ -1284,7 +1364,7 @@ of the file is correct</h2><h4>../src/storage.cpp:921</h4><pre style="background
 			{
 				// the directory exists, check all the files
 				for (int i = 0; i &lt; f.num_files(); ++i)
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(25)">../src/torrent.cpp:726</a></td><td>post alert</td></tr><tr id="25" style="display: none;" colspan="3"><td colspan="3"><h2>post alert</h2><h4>../src/torrent.cpp:726</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(26)">../src/torrent.cpp:726</a></td><td>post alert</td></tr><tr id="26" style="display: none;" colspan="3"><td colspan="3"><h2>post alert</h2><h4>../src/torrent.cpp:726</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		state_updated();
 
 		set_state(torrent_status::downloading);
 
@@ -1335,7 +1415,7 @@ of the file is correct</h2><h4>../src/storage.cpp:921</h4><pre style="background
 		TORRENT_ASSERT(piece &gt;= 0);
 		TORRENT_ASSERT(m_verified.get_bit(piece) == false);
 		++m_num_verified;
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(26)">../src/torrent.cpp:4807</a></td><td>abort lookups this torrent has made via the session host resolver interface</td></tr><tr id="26" style="display: none;" colspan="3"><td colspan="3"><h2>abort lookups this torrent has made via the
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(27)">../src/torrent.cpp:4807</a></td><td>abort lookups this torrent has made via the session host resolver interface</td></tr><tr id="27" style="display: none;" colspan="3"><td colspan="3"><h2>abort lookups this torrent has made via the
 session host resolver interface</h2><h4>../src/torrent.cpp:4807</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// files belonging to the torrents
 		disconnect_all(errors::torrent_aborted, op_bittorrent);
 
@@ -1387,7 +1467,7 @@ session host resolver interface</h2><h4>../src/torrent.cpp:4807</h4><pre style="
 		for (peer_iterator i = begin(); i != end(); ++i)
 		{
 			(*i)-&gt;superseed_piece(-1, -1);
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(27)">../src/torrent.cpp:4951</a></td><td>the tracker login feature should probably be deprecated</td></tr><tr id="27" style="display: none;" colspan="3"><td colspan="3"><h2>the tracker login feature should probably be deprecated</h2><h4>../src/torrent.cpp:4951</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (alerts().should_post&lt;file_renamed_alert&gt;())
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(28)">../src/torrent.cpp:4951</a></td><td>the tracker login feature should probably be deprecated</td></tr><tr id="28" style="display: none;" colspan="3"><td colspan="3"><h2>the tracker login feature should probably be deprecated</h2><h4>../src/torrent.cpp:4951</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (alerts().should_post&lt;file_renamed_alert&gt;())
 				alerts().emplace_alert&lt;file_renamed_alert&gt;(get_handle(), j-&gt;buffer, j-&gt;piece);
 			m_torrent_file-&gt;rename_file(j-&gt;piece, j-&gt;buffer);
 		}
@@ -1438,7 +1518,7 @@ session host resolver interface</h2><h4>../src/torrent.cpp:4807</h4><pre style="
 			= m_connections.begin(), end(m_connections.end()); i != end; ++i)
 		{
 			// for each peer, go through its download and request queue
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(28)">../src/torrent.cpp:7808</a></td><td>if peer is a really good peer, maybe we shouldn't disconnect it</td></tr><tr id="28" style="display: none;" colspan="3"><td colspan="3"><h2>if peer is a really good peer, maybe we shouldn't disconnect it</h2><h4>../src/torrent.cpp:7808</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#ifndef TORRENT_DISABLE_LOGGING
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(29)">../src/torrent.cpp:7808</a></td><td>if peer is a really good peer, maybe we shouldn't disconnect it</td></tr><tr id="29" style="display: none;" colspan="3"><td colspan="3"><h2>if peer is a really good peer, maybe we shouldn't disconnect it</h2><h4>../src/torrent.cpp:7808</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#ifndef TORRENT_DISABLE_LOGGING
 		debug_log("incoming peer (%d)", int(m_connections.size()));
 #endif
 
@@ -1489,7 +1569,7 @@ session host resolver interface</h2><h4>../src/torrent.cpp:4807</h4><pre style="
 		if (m_abort) return false;
 
 		if (!m_connections.empty()) return true;
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(29)">../src/tracker_manager.cpp:200</a></td><td>some of these arguments could probably be moved to the tracker request itself. like the ip_filter and settings</td></tr><tr id="29" style="display: none;" colspan="3"><td colspan="3"><h2>some of these arguments could probably be moved to the
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(30)">../src/tracker_manager.cpp:200</a></td><td>some of these arguments could probably be moved to the tracker request itself. like the ip_filter and settings</td></tr><tr id="30" style="display: none;" colspan="3"><td colspan="3"><h2>some of these arguments could probably be moved to the
 tracker request itself. like the ip_filter and settings</h2><h4>../src/tracker_manager.cpp:200</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			, interval == 0 ? min_interval : interval);
 		close();
 	}
@@ -1541,7 +1621,7 @@ tracker request itself. like the ip_filter and settings</h2><h4>../src/tracker_m
 		TORRENT_ASSERT(m_ses.is_single_thread());
 		m_stats_counters.inc_stats_counter(counters::sent_tracker_bytes, bytes);
 	}
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(30)">../src/udp_tracker_connection.cpp:83</a></td><td>support authentication here. tracker_req().auth</td></tr><tr id="30" style="display: none;" colspan="3"><td colspan="3"><h2>support authentication here. tracker_req().auth</h2><h4>../src/udp_tracker_connection.cpp:83</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		udp_tracker_connection::m_connection_cache;
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(31)">../src/udp_tracker_connection.cpp:83</a></td><td>support authentication here. tracker_req().auth</td></tr><tr id="31" style="display: none;" colspan="3"><td colspan="3"><h2>support authentication here. tracker_req().auth</h2><h4>../src/udp_tracker_connection.cpp:83</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		udp_tracker_connection::m_connection_cache;
 
 	mutex udp_tracker_connection::m_cache_mutex;
 
@@ -1592,7 +1672,7 @@ tracker request itself. like the ip_filter and settings</h2><h4>../src/tracker_m
 #if defined TORRENT_ASIO_DEBUGGING
 			add_outstanding_async("udp_tracker_connection::name_lookup");
 #endif
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(31)">../src/ut_metadata.cpp:120</a></td><td>if we were to initialize m_metadata_size lazily instead, we would probably be more efficient initialize m_metadata_size</td></tr><tr id="31" style="display: none;" colspan="3"><td colspan="3"><h2>if we were to initialize m_metadata_size lazily instead,
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(32)">../src/ut_metadata.cpp:120</a></td><td>if we were to initialize m_metadata_size lazily instead, we would probably be more efficient initialize m_metadata_size</td></tr><tr id="32" style="display: none;" colspan="3"><td colspan="3"><h2>if we were to initialize m_metadata_size lazily instead,
 we would probably be more efficient
 initialize m_metadata_size</h2><h4>../src/ut_metadata.cpp:120</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				metadata();
 		}
@@ -1645,7 +1725,7 @@ initialize m_metadata_size</h2><h4>../src/ut_metadata.cpp:120</h4><pre style="ba
 			, char const* buf, int size, int piece, int total_size);
 
 		// returns a piece of the metadata that
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(32)">../src/utp_stream.cpp:351</a></td><td>it would be nice if not everything would have to be public here</td></tr><tr id="32" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice if not everything would have to be public here</h2><h4>../src/utp_stream.cpp:351</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	void incoming(boost::uint8_t const* buf, int size, packet* p, time_point now);
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(33)">../src/utp_stream.cpp:351</a></td><td>it would be nice if not everything would have to be public here</td></tr><tr id="33" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice if not everything would have to be public here</h2><h4>../src/utp_stream.cpp:351</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	void incoming(boost::uint8_t const* buf, int size, packet* p, time_point now);
 	void do_ledbat(int acked_bytes, int delay, int in_flight);
 	int packet_timeout() const;
 	bool test_socket_state();
@@ -1696,7 +1776,7 @@ private:
 	{
 		iovec_t(void* b, size_t l): buf(b), len(l) {}
 		void* buf;
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(33)">../src/web_peer_connection.cpp:632</a></td><td>just make this peer not have the pieces associated with the file we just requested. Only when it doesn't have any of the file do the following</td></tr><tr id="33" style="display: none;" colspan="3"><td colspan="3"><h2>just make this peer not have the pieces
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(34)">../src/web_peer_connection.cpp:632</a></td><td>just make this peer not have the pieces associated with the file we just requested. Only when it doesn't have any of the file do the following</td></tr><tr id="34" style="display: none;" colspan="3"><td colspan="3"><h2>just make this peer not have the pieces
 associated with the file we just requested. Only
 when it doesn't have any of the file do the following</h2><h4>../src/web_peer_connection.cpp:632</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			++m_num_responses;
 
@@ -1749,7 +1829,7 @@ when it doesn't have any of the file do the following</h2><h4>../src/web_peer_co
 				{
 					// we should not try this server again.
 					t-&gt;remove_web_seed(this, errors::missing_location, op_bittorrent, 2);
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(34)">../src/web_peer_connection.cpp:691</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="34" style="display: none;" colspan="3"><td colspan="3"><h2>create a mapping of file-index to redirection URLs. Use that to form
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(35)">../src/web_peer_connection.cpp:691</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="35" 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:691</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">						== dl_target);
 #endif
@@ -1802,7 +1882,12 @@ peer_connection</h2><h4>../src/web_peer_connection.cpp:691</h4><pre style="backg
 #endif
 					t-&gt;add_web_seed(location, web_seed_entry::url_seed, m_external_auth, m_extra_headers);
 					t-&gt;remove_web_seed(this, errors::redirecting, op_bittorrent, 2);
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(35)">../src/kademlia/node.cpp:69</a></td><td>make this configurable in dht_settings</td></tr><tr id="35" style="display: none;" colspan="3"><td colspan="3"><h2>make this configurable in dht_settings</h2><h4>../src/kademlia/node.cpp:69</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include "libtorrent/kademlia/node_id.hpp"
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(36)">../src/kademlia/node.cpp:71</a></td><td>make this configurable in dht_settings</td></tr><tr id="36" style="display: none;" colspan="3"><td colspan="3"><h2>make this configurable in dht_settings</h2><h4>../src/kademlia/node.cpp:71</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include "libtorrent/random.hpp"
+#include "libtorrent/aux_/session_impl.hpp"
+#include "libtorrent/alert_types.hpp" // for dht_lookup
+#include "libtorrent/performance_counters.hpp" // for counters
+
+#include "libtorrent/kademlia/node_id.hpp"
 #include "libtorrent/kademlia/rpc_manager.hpp"
 #include "libtorrent/kademlia/routing_table.hpp"
 #include "libtorrent/kademlia/node.hpp"
@@ -1811,11 +1896,6 @@ peer_connection</h2><h4>../src/web_peer_connection.cpp:691</h4><pre style="backg
 #include "libtorrent/kademlia/refresh.hpp"
 #include "libtorrent/kademlia/get_peers.hpp"
 #include "libtorrent/kademlia/get_item.hpp"
-#include "libtorrent/performance_counters.hpp" // for counters
-
-#ifdef TORRENT_USE_VALGRIND
-#include &lt;valgrind/memcheck.h&gt;
-#endif
 
 namespace libtorrent { namespace dht
 {
@@ -1824,10 +1904,6 @@ using detail::write_endpoint;
 
 <div style="background: #ffff00" width="100%">enum { announce_interval = 30 };
 </div>
-#ifdef TORRENT_DHT_VERBOSE_LOGGING
-TORRENT_DEFINE_LOG(node)
-#endif
-
 namespace {
 
 // remove peers that have timed out
@@ -1838,12 +1914,7 @@ void purge_peers(std::set&lt;peer_entry&gt;&amp; peers)
 	{
 		// the peer has timed out
 		if (i-&gt;added + minutes(int(announce_interval * 1.5f)) &lt; aux::time_now())
-		{
-#ifdef TORRENT_DHT_VERBOSE_LOGGING
-			TORRENT_LOG(node) &lt;&lt; "peer timed out at: " &lt;&lt; i-&gt;addr;
-#endif
 			peers.erase(i++);
-		}
 		else
 			++i;
 	}
@@ -1853,8 +1924,17 @@ void nop() {}
 
 node_id calculate_node_id(node_id const&amp; nid, dht_observer* observer)
 {
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(36)">../src/kademlia/node.cpp:497</a></td><td>it would be nice to have a bias towards node-id prefixes that are missing in the bucket</td></tr><tr id="36" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to have a bias towards node-id prefixes that
-are missing in the bucket</h2><h4>../src/kademlia/node.cpp:497</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// this shouldn't happen
+	address external_address;
+	if (observer) external_address = observer-&gt;external_address();
+	if (nid == (node_id::min)() || !verify_id(nid, external_address))
+		return generate_id(external_address);
+  	
+	return nid;
+}
+
+} // anonymous namespace
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(37)">../src/kademlia/node.cpp:503</a></td><td>it would be nice to have a bias towards node-id prefixes that are missing in the bucket</td></tr><tr id="37" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to have a bias towards node-id prefixes that
+are missing in the bucket</h2><h4>../src/kademlia/node.cpp:503</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// this shouldn't happen
 	TORRENT_ASSERT(m_id != ne-&gt;id);
 	if (ne-&gt;id == m_id) return;
 
@@ -1905,7 +1985,7 @@ void node::send_single_refresh(udp::endpoint const&amp; ep, int bucket
 time_duration node::connection_timeout()
 {
 	time_duration d = m_rpc.tick();
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(37)">../src/kademlia/node.cpp:587</a></td><td>use the non deprecated function instead of this one</td></tr><tr id="37" style="display: none;" colspan="3"><td colspan="3"><h2>use the non deprecated function instead of this one</h2><h4>../src/kademlia/node.cpp:587</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	return d;
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(38)">../src/kademlia/node.cpp:593</a></td><td>use the non deprecated function instead of this one</td></tr><tr id="38" style="display: none;" colspan="3"><td colspan="3"><h2>use the non deprecated function instead of this one</h2><h4>../src/kademlia/node.cpp:593</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	return d;
 }
 
 void node::status(std::vector&lt;dht_routing_bucket&gt;&amp; table
@@ -1956,7 +2036,7 @@ void node::lookup_peers(sha1_hash const&amp; info_hash, entry&amp; reply
 	torrent_entry const&amp; v = i-&gt;second;
 
 	if (!v.name.empty()) reply["n"] = v.name;
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(38)">../src/kademlia/node.cpp:919</a></td><td>find_node should write directly to the response entry</td></tr><tr id="38" style="display: none;" colspan="3"><td colspan="3"><h2>find_node should write directly to the response entry</h2><h4>../src/kademlia/node.cpp:919</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			TORRENT_LOG(node) &lt;&lt; " values: " &lt;&lt; reply["values"].list().size();
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(39)">../src/kademlia/node.cpp:926</a></td><td>find_node should write directly to the response entry</td></tr><tr id="39" style="display: none;" colspan="3"><td colspan="3"><h2>find_node should write directly to the response entry</h2><h4>../src/kademlia/node.cpp:926</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				, int(reply["values"].list().size()));
 		}
 #endif
 	}
@@ -2007,7 +2087,7 @@ void node::lookup_peers(sha1_hash const&amp; info_hash, entry&amp; reply
 			port = m.addr.port();
 
 		if (port &lt; 0 || port &gt;= 65536)
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(39)">../src/kademlia/routing_table.cpp:114</a></td><td>use the non deprecated function instead of this one</td></tr><tr id="39" style="display: none;" colspan="3"><td colspan="3"><h2>use the non deprecated function instead of this one</h2><h4>../src/kademlia/routing_table.cpp:114</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(40)">../src/kademlia/routing_table.cpp:116</a></td><td>use the non deprecated function instead of this one</td></tr><tr id="40" style="display: none;" colspan="3"><td colspan="3"><h2>use the non deprecated function instead of this one</h2><h4>../src/kademlia/routing_table.cpp:116</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 	static const int size_exceptions[] = {16, 8, 4, 2};
 	if (bucket &lt; int(sizeof(size_exceptions)/sizeof(size_exceptions[0])))
 		return m_bucket_size * size_exceptions[bucket];
@@ -2058,7 +2138,7 @@ boost::tuple&lt;int, int, int&gt; routing_table::size() const
 		nodes += i-&gt;live_nodes.size();
 		for (bucket_t::const_iterator k = i-&gt;live_nodes.begin()
 			, end(i-&gt;live_nodes.end()); k != end; ++k)
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(40)">../src/kademlia/routing_table.cpp:946</a></td><td>move the lowest priority nodes to the replacement bucket</td></tr><tr id="40" 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:946</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: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(41)">../src/kademlia/routing_table.cpp:955</a></td><td>move the lowest priority nodes to the replacement bucket</td></tr><tr id="41" 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:955</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())
@@ -2109,7 +2189,7 @@ boost::tuple&lt;int, int, int&gt; routing_table::size() const
 			else
 				new_replacement_bucket.push_back(*j);
 		}
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(41)">../include/libtorrent/alert_types.hpp:1428</a></td><td>should the alert baseclass have this object instead?</td></tr><tr id="41" style="display: none;" colspan="3"><td colspan="3"><h2>should the alert baseclass have this object instead?</h2><h4>../include/libtorrent/alert_types.hpp:1428</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(42)">../include/libtorrent/alert_types.hpp:1428</a></td><td>should the alert baseclass have this object instead?</td></tr><tr id="42" style="display: none;" colspan="3"><td colspan="3"><h2>should the alert baseclass have this object instead?</h2><h4>../include/libtorrent/alert_types.hpp:1428</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
 		// internal
 		portmap_log_alert(aux::stack_allocator&amp; alloc, int t, const char* m);
 
@@ -2160,7 +2240,7 @@ boost::tuple&lt;int, int, int&gt; routing_table::size() const
 #endif
 
 		// If the error happend to a specific file, this returns the path to it.
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(42)">../include/libtorrent/build_config.hpp:40</a></td><td>instead of using a dummy function to cause link errors when incompatible build configurations are used, make the namespace name depend on the configuration, and have a using declaration in the headers to pull it into libtorrent.</td></tr><tr id="42" style="display: none;" colspan="3"><td colspan="3"><h2>instead of using a dummy function to cause link errors when
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(43)">../include/libtorrent/build_config.hpp:40</a></td><td>instead of using a dummy function to cause link errors when incompatible build configurations are used, make the namespace name depend on the configuration, and have a using declaration in the headers to pull it into libtorrent.</td></tr><tr id="43" style="display: none;" colspan="3"><td colspan="3"><h2>instead of using a dummy function to cause link errors when
 incompatible build configurations are used, make the namespace name
 depend on the configuration, and have a using declaration in the headers
 to pull it into libtorrent.</h2><h4>../include/libtorrent/build_config.hpp:40</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -2203,7 +2283,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #endif
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(43)">../include/libtorrent/enum_net.hpp:143</a></td><td>this could be done more efficiently by just looking up the interface with the given name, maybe even with if_nametoindex()</td></tr><tr id="43" style="display: none;" colspan="3"><td colspan="3"><h2>this could be done more efficiently by just looking up
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(44)">../include/libtorrent/enum_net.hpp:143</a></td><td>this could be done more efficiently by just looking up the interface with the given name, maybe even with if_nametoindex()</td></tr><tr id="44" style="display: none;" colspan="3"><td colspan="3"><h2>this could be done more efficiently by just looking up
 the interface with the given name, maybe even with if_nametoindex()</h2><h4>../include/libtorrent/enum_net.hpp:143</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		address ip = address::from_string(device_name, ec);
 		if (!ec)
@@ -2255,7 +2335,7 @@ the interface with the given name, maybe even with if_nametoindex()</h2><h4>../i
 
 	// returns true if the given device exists
 	TORRENT_EXTRA_EXPORT bool has_interface(char const* name, io_service&amp; ios
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(44)">../include/libtorrent/heterogeneous_queue.hpp:56</a></td><td>add emplace_back() version</td></tr><tr id="44" style="display: none;" colspan="3"><td colspan="3"><h2>add emplace_back() version</h2><h4>../include/libtorrent/heterogeneous_queue.hpp:56</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include &lt;vector&gt;
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(45)">../include/libtorrent/heterogeneous_queue.hpp:56</a></td><td>add emplace_back() version</td></tr><tr id="45" style="display: none;" colspan="3"><td colspan="3"><h2>add emplace_back() version</h2><h4>../include/libtorrent/heterogeneous_queue.hpp:56</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include &lt;vector&gt;
 
 #include &lt;boost/cstdint.hpp&gt;
 #include &lt;boost/utility/enable_if.hpp&gt;
@@ -2306,7 +2386,7 @@ namespace libtorrent {
 
 		void get_pointers(std::vector&lt;T*&gt;&amp; out)
 		{
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(45)">../include/libtorrent/piece_picker.hpp:600</a></td><td>having 8 priority levels is probably excessive. It should probably be changed to 3 levels + dont-download</td></tr><tr id="45" style="display: none;" colspan="3"><td colspan="3"><h2>having 8 priority levels is probably excessive. It should
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(46)">../include/libtorrent/piece_picker.hpp:600</a></td><td>having 8 priority levels is probably excessive. It should probably be changed to 3 levels + dont-download</td></tr><tr id="46" style="display: none;" colspan="3"><td colspan="3"><h2>having 8 priority levels is probably excessive. It should
 probably be changed to 3 levels + dont-download</h2><h4>../include/libtorrent/piece_picker.hpp:600</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// the number of peers that has this piece
 			// (availability)
 #ifdef TORRENT_OPTIMIZE_MEMORY_USAGE
@@ -2358,7 +2438,7 @@ probably be changed to 3 levels + dont-download</h2><h4>../include/libtorrent/pi
 #ifdef TORRENT_OPTIMIZE_MEMORY_USAGE
 				we_have_index = 0x3ffff,
 #else
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(46)">../include/libtorrent/proxy_base.hpp:259</a></td><td>use the resolver interface that has a built-in cache</td></tr><tr id="46" style="display: none;" colspan="3"><td colspan="3"><h2>use the resolver interface that has a built-in cache</h2><h4>../include/libtorrent/proxy_base.hpp:259</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		return m_sock.lowest_layer();
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(47)">../include/libtorrent/proxy_base.hpp:259</a></td><td>use the resolver interface that has a built-in cache</td></tr><tr id="47" style="display: none;" colspan="3"><td colspan="3"><h2>use the resolver interface that has a built-in cache</h2><h4>../include/libtorrent/proxy_base.hpp:259</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		return m_sock.lowest_layer();
 	}
 
 	next_layer_type&amp; next_layer()
@@ -2385,7 +2465,7 @@ protected:
 
 #endif
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(47)">../include/libtorrent/session.hpp:198</a></td><td>the two second constructors here should probably be deprecated in favor of the more generic one that just takes a settings_pack and a string</td></tr><tr id="47" style="display: none;" colspan="3"><td colspan="3"><h2>the two second constructors here should probably
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(48)">../include/libtorrent/session.hpp:198</a></td><td>the two second constructors here should probably be deprecated in favor of the more generic one that just takes a settings_pack and a string</td></tr><tr id="48" style="display: none;" colspan="3"><td colspan="3"><h2>the two second constructors here should probably
 be deprecated in favor of the more generic one that just
 takes a settings_pack and a string</h2><h4>../include/libtorrent/session.hpp:198</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// nat-pmp) and default plugins (ut_metadata, ut_pex and smart_ban). The
 		// default is to start those features. If you do not want them to start,
@@ -2438,7 +2518,7 @@ takes a settings_pack and a string</h2><h4>../include/libtorrent/session.hpp:198
 			pack.set_str(settings_pack::listen_interfaces, if_string);
 
 			if ((flags &amp; start_default_features) == 0)
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(48)">../include/libtorrent/session.hpp:249</a></td><td>the ip filter should probably be saved here too</td></tr><tr id="48" style="display: none;" colspan="3"><td colspan="3"><h2>the ip filter should probably be saved here too</h2><h4>../include/libtorrent/session.hpp:249</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			pack.set_str(settings_pack::listen_interfaces, if_string);
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(49)">../include/libtorrent/session.hpp:249</a></td><td>the ip filter should probably be saved here too</td></tr><tr id="49" style="display: none;" colspan="3"><td colspan="3"><h2>the ip filter should probably be saved here too</h2><h4>../include/libtorrent/session.hpp:249</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			pack.set_str(settings_pack::listen_interfaces, if_string);
 
 			if ((flags &amp; start_default_features) == 0)
 			{
@@ -2489,7 +2569,7 @@ takes a settings_pack and a string</h2><h4>../include/libtorrent/session.hpp:198
 			save_peer_proxy = save_proxy,
 			save_web_proxy = save_proxy,
 			save_tracker_proxy = save_proxy
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(49)">../include/libtorrent/session_settings.hpp:55</a></td><td>this type is only used internally now. move it to an internal header and make this type properly deprecated.</td></tr><tr id="49" style="display: none;" colspan="3"><td colspan="3"><h2>this type is only used internally now. move it to an internal
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(50)">../include/libtorrent/session_settings.hpp:55</a></td><td>this type is only used internally now. move it to an internal header and make this type properly deprecated.</td></tr><tr id="50" style="display: none;" colspan="3"><td colspan="3"><h2>this type is only used internally now. move it to an internal
 header and make this type properly deprecated.</h2><h4>../include/libtorrent/session_settings.hpp:55</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 #include "libtorrent/version.hpp"
 #include "libtorrent/config.hpp"
@@ -2541,7 +2621,7 @@ namespace libtorrent
 		// proxy_settings::type field.
 		enum proxy_type
 		{
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(50)">../include/libtorrent/socket_type.hpp:321</a></td><td>it would be nice to use aligned_storage here when building on c++11</td></tr><tr id="50" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to use aligned_storage here when
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(51)">../include/libtorrent/socket_type.hpp:321</a></td><td>it would be nice to use aligned_storage here when building on c++11</td></tr><tr id="51" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to use aligned_storage here when
 building on c++11</h2><h4>../include/libtorrent/socket_type.hpp:321</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			sizeof(stream_socket)
 			, sizeof(socks5_stream)
 			, sizeof(http_stream)
@@ -2587,7 +2667,7 @@ building on c++11</h2><h4>../include/libtorrent/socket_type.hpp:321</h4><pre sty
 
 #endif
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(51)">../include/libtorrent/socks5_stream.hpp:135</a></td><td>add async_connect() that takes a hostname and port as well</td></tr><tr id="51" style="display: none;" colspan="3"><td colspan="3"><h2>add async_connect() that takes a hostname and port as well</h2><h4>../include/libtorrent/socks5_stream.hpp:135</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (m_dst_name.size() &gt; 255)
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(52)">../include/libtorrent/socks5_stream.hpp:135</a></td><td>add async_connect() that takes a hostname and port as well</td></tr><tr id="52" style="display: none;" colspan="3"><td colspan="3"><h2>add async_connect() that takes a hostname and port as well</h2><h4>../include/libtorrent/socks5_stream.hpp:135</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (m_dst_name.size() &gt; 255)
 			m_dst_name.resize(255);
 	}
 
@@ -2638,7 +2718,7 @@ building on c++11</h2><h4>../include/libtorrent/socket_type.hpp:321</h4><pre sty
 		m_resolver.async_resolve(q, boost::bind(
 			&amp;socks5_stream::name_lookup, this, _1, _2, h));
 	}
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(52)">../include/libtorrent/tracker_manager.hpp:280</a></td><td>this class probably doesn't need to have virtual functions.</td></tr><tr id="52" style="display: none;" colspan="3"><td colspan="3"><h2>this class probably doesn't need to have virtual functions.</h2><h4>../include/libtorrent/tracker_manager.hpp:280</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		int m_completion_timeout;
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(53)">../include/libtorrent/tracker_manager.hpp:276</a></td><td>this class probably doesn't need to have virtual functions.</td></tr><tr id="53" style="display: none;" colspan="3"><td colspan="3"><h2>this class probably doesn't need to have virtual functions.</h2><h4>../include/libtorrent/tracker_manager.hpp:276</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		int m_completion_timeout;
 
 		typedef mutex mutex_t;
 		mutable mutex_t m_mutex;
@@ -2689,8 +2769,59 @@ building on c++11</h2><h4>../include/libtorrent/socket_type.hpp:321</h4><pre sty
 
 		boost::shared_ptr&lt;tracker_connection&gt; shared_from_this()
 		{
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(53)">../include/libtorrent/aux_/session_interface.hpp:146</a></td><td>the IP voting mechanism should be factored out to its own class, not part of the session</td></tr><tr id="53" style="display: none;" colspan="3"><td colspan="3"><h2>the IP voting mechanism should be factored out
-to its own class, not part of the session</h2><h4>../include/libtorrent/aux_/session_interface.hpp:146</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if TORRENT_USE_ASSERTS
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(54)">../include/libtorrent/kademlia/observer.hpp:133</a></td><td>make this private and unconditional</td></tr><tr id="54" style="display: none;" colspan="3"><td colspan="3"><h2>make this private and unconditional</h2><h4>../include/libtorrent/kademlia/observer.hpp:133</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	node_id const&amp; id() const { return m_id; }
+
+	void set_transaction_id(boost::uint16_t tid)
+	{ m_transaction_id = tid; }
+
+	boost::uint16_t transaction_id() const
+	{ return m_transaction_id; }
+
+	enum {
+		flag_queried = 1,
+		flag_initial = 2,
+		flag_no_id = 4,
+		flag_short_timeout = 8,
+		flag_failed = 16,
+		flag_ipv6_address = 32,
+		flag_alive = 64,
+		flag_done = 128
+	};
+
+#ifndef TORRENT_DHT_VERBOSE_LOGGING
+<div style="background: #ffff00" width="100%">protected:
+</div>#endif
+
+	void done();
+
+	time_point m_sent;
+
+	const boost::intrusive_ptr&lt;traversal_algorithm&gt; m_algorithm;
+
+	node_id m_id;
+
+	TORRENT_UNION addr_t
+	{
+#if TORRENT_USE_IPV6
+		address_v6::bytes_type v6;
+#endif
+		address_v4::bytes_type v4;
+	} m_addr;
+
+	// reference counter for intrusive_ptr
+	mutable boost::uint16_t m_refs;
+
+	boost::uint16_t m_port;
+
+	// the transaction ID for this call
+	boost::uint16_t m_transaction_id;
+public:
+	unsigned char flags;
+
+#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
+	bool m_in_constructor:1;
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(55)">../include/libtorrent/aux_/session_interface.hpp:138</a></td><td>the IP voting mechanism should be factored out to its own class, not part of the session</td></tr><tr id="55" style="display: none;" colspan="3"><td colspan="3"><h2>the IP voting mechanism should be factored out
+to its own class, not part of the session</h2><h4>../include/libtorrent/aux_/session_interface.hpp:138</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if TORRENT_USE_ASSERTS
 		virtual bool is_single_thread() const = 0;
 		virtual bool has_peer(peer_connection const* p) const = 0;
 		virtual bool any_torrent_has_peer(peer_connection const* p) const = 0;
@@ -2733,7 +2864,7 @@ to its own class, not part of the session</h2><h4>../include/libtorrent/aux_/ses
 		typedef boost::function&lt;void(error_code const&amp;, std::vector&lt;address&gt; const&amp;)&gt;
 			callback_t;
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(54)">../include/libtorrent/aux_/session_interface.hpp:171</a></td><td>remove this. There's already get_resolver()</td></tr><tr id="54" style="display: none;" colspan="3"><td colspan="3"><h2>remove this. There's already get_resolver()</h2><h4>../include/libtorrent/aux_/session_interface.hpp:171</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			source_peer = 2,
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(56)">../include/libtorrent/aux_/session_interface.hpp:163</a></td><td>remove this. There's already get_resolver()</td></tr><tr id="56" style="display: none;" colspan="3"><td colspan="3"><h2>remove this. There's already get_resolver()</h2><h4>../include/libtorrent/aux_/session_interface.hpp:163</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			source_peer = 2,
 			source_tracker = 4,
 			source_router = 8
 		};
@@ -2784,9 +2915,9 @@ to its own class, not part of the session</h2><h4>../include/libtorrent/aux_/ses
 		virtual boost::shared_ptr&lt;torrent&gt; delay_load_torrent(sha1_hash const&amp; info_hash
 			, peer_connection* pc) = 0;
 		virtual void insert_torrent(sha1_hash const&amp; ih, boost::shared_ptr&lt;torrent&gt; const&amp; t
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(55)">../include/libtorrent/aux_/session_interface.hpp:226</a></td><td>factor out the thread pool for socket jobs into a separate class used to (potentially) issue socket write calls onto multiple threads</td></tr><tr id="55" style="display: none;" colspan="3"><td colspan="3"><h2>factor out the thread pool for socket jobs into a separate
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(57)">../include/libtorrent/aux_/session_interface.hpp:218</a></td><td>factor out the thread pool for socket jobs into a separate class used to (potentially) issue socket write calls onto multiple threads</td></tr><tr id="57" style="display: none;" colspan="3"><td colspan="3"><h2>factor out the thread pool for socket jobs into a separate
 class
-used to (potentially) issue socket write calls onto multiple threads</h2><h4>../include/libtorrent/aux_/session_interface.hpp:226</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		virtual int num_torrents() const = 0;
+used to (potentially) issue socket write calls onto multiple threads</h2><h4>../include/libtorrent/aux_/session_interface.hpp:218</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		virtual int num_torrents() const = 0;
 
 		virtual peer_id const&amp; get_peer_id() const = 0;
 
@@ -2827,7 +2958,7 @@ used to (potentially) issue socket write calls onto multiple threads</h2><h4>../
 			std::string const&amp; collection) const = 0;
 #endif
 
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(56)">../src/disk_io_thread.cpp:206</a></td><td>it would be nice to have the number of threads be set dynamically</td></tr><tr id="56" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to have the number of threads be set dynamically</h2><h4>../src/disk_io_thread.cpp:206</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		std::pair&lt;block_cache::iterator, block_cache::iterator&gt; pieces
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(58)">../src/disk_io_thread.cpp:206</a></td><td>it would be nice to have the number of threads be set dynamically</td></tr><tr id="58" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to have the number of threads be set dynamically</h2><h4>../src/disk_io_thread.cpp:206</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		std::pair&lt;block_cache::iterator, block_cache::iterator&gt; pieces
 			= m_disk_cache.all_pieces();
 		TORRENT_ASSERT(pieces.first == pieces.second);
 #endif
@@ -2878,7 +3009,7 @@ used to (potentially) issue socket write calls onto multiple threads</h2><h4>../
 			m_threads.resize(m_num_threads);
 		}
 	}
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(57)">../src/http_seed_connection.cpp:123</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="57" 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(59)">../src/http_seed_connection.cpp:123</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="59" 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:123</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	boost::optional&lt;piece_block_progress&gt;
 	http_seed_connection::downloading_piece_progress() const
 	{
@@ -2930,8 +3061,8 @@ the chunk headers should be subtracted from the receive_buffer_size</h2><h4>../s
 		std::string request;
 		request.reserve(400);
 
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(58)">../src/session_impl.cpp:5227</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="58" 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:5227</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(60)">../src/session_impl.cpp:5223</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="60" 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:5223</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_single_thread());
@@ -2982,9 +3113,9 @@ this understanding of our external address, instead of the empty address</h2><h4
 	session_status session_impl::status() const
 	{
 //		INVARIANT_CHECK;
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(59)">../src/session_impl.cpp:6497</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="59" 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(61)">../src/session_impl.cpp:6506</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="61" 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:6497</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:6506</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#endif
 
 		if (!m_external_ip.cast_vote(ip, source_type, source)) return;
 
@@ -3035,7 +3166,7 @@ is kind of expensive, it would be nice to not do it unnecessarily</h2><h4>../src
 		, boost::function&lt;void(char*)&gt; const&amp; handler)
 	{
 		return m_disk_thread.async_allocate_disk_buffer(category, handler);
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(60)">../src/torrent.cpp:1168</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="60" 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(62)">../src/torrent.cpp:1168</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="62" 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
@@ -3090,7 +3221,7 @@ up to the highest written piece in each file</h2><h4>../src/torrent.cpp:1168</h4
 			{
 				if (request_a_block(*this, *p))
 					inc_stats_counter(counters::hash_fail_piece_picks);
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(61)">../src/torrent.cpp:6956</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="61" style="display: none;" colspan="3"><td colspan="3"><h2>save the send_stats state instead of throwing them away
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(63)">../src/torrent.cpp:6956</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="63" 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:6956</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					for (int k = 0; k &lt; bits; ++k)
 						v |= (info[j*8+k].state == piece_picker::block_info::state_finished)
 						? (1 &lt;&lt; k) : 0;
@@ -3142,7 +3273,7 @@ it may pose an issue when downgrading though</h2><h4>../src/torrent.cpp:6956</h4
 		// 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(62)">../src/torrent.cpp:8057</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="62" 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(64)">../src/torrent.cpp:8057</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="64" 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:8057</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		set_state(torrent_status::finished);
 		set_queue_position(-1);
@@ -3195,7 +3326,7 @@ for all peers though</h2><h4>../src/torrent.cpp:8057</h4><pre style="background:
 			, boost::bind(&amp;torrent::on_cache_flushed, shared_from_this(), _1));
 		
 		// this torrent just completed downloads, which means it will fall
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(63)">../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="63" 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(65)">../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="65" 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
 		time_point m_last_rotate;
 	};
@@ -3222,7 +3353,7 @@ for all peers though</h2><h4>../src/torrent.cpp:8057</h4><pre style="background:
 
 #endif
 
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(64)">../include/libtorrent/web_peer_connection.hpp:120</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="64" 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(66)">../include/libtorrent/web_peer_connection.hpp:120</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="66" 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:120</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// returns the block currently being
@@ -3275,7 +3406,7 @@ use allocate_disk_receive_buffer and release_disk_receive_buffer</h2><h4>../incl
 	};
 }
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(65)">../test/test_block_cache.cpp:469</a></td><td>test try_evict_blocks</td></tr><tr id="65" style="display: none;" colspan="3"><td colspan="3"><h2>test try_evict_blocks</h2><h4>../test/test_block_cache.cpp:469</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(66)">../test/test_block_cache.cpp:470</a></td><td>test evicting volatile pieces, to see them be removed</td></tr><tr id="66" style="display: none;" colspan="3"><td colspan="3"><h2>test evicting volatile pieces, to see them be removed</h2><h4>../test/test_block_cache.cpp:470</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)">../test/test_block_cache.cpp:471</a></td><td>test evicting dirty pieces</td></tr><tr id="67" style="display: none;" colspan="3"><td colspan="3"><h2>test evicting dirty pieces</h2><h4>../test/test_block_cache.cpp:471</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)">../test/test_block_cache.cpp:472</a></td><td>test free_piece</td></tr><tr id="68" style="display: none;" colspan="3"><td colspan="3"><h2>test free_piece</h2><h4>../test/test_block_cache.cpp:472</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(69)">../test/test_block_cache.cpp:473</a></td><td>test abort_dirty</td></tr><tr id="69" style="display: none;" colspan="3"><td colspan="3"><h2>test abort_dirty</h2><h4>../test/test_block_cache.cpp:473</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(70)">../test/test_block_cache.cpp:474</a></td><td>test unaligned reads</td></tr><tr id="70" style="display: none;" colspan="3"><td colspan="3"><h2>test unaligned reads</h2><h4>../test/test_block_cache.cpp:474</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// it's supposed to be a cache hit
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(67)">../test/test_block_cache.cpp:469</a></td><td>test try_evict_blocks</td></tr><tr id="67" style="display: none;" colspan="3"><td colspan="3"><h2>test try_evict_blocks</h2><h4>../test/test_block_cache.cpp:469</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)">../test/test_block_cache.cpp:470</a></td><td>test evicting volatile pieces, to see them be removed</td></tr><tr id="68" style="display: none;" colspan="3"><td colspan="3"><h2>test evicting volatile pieces, to see them be removed</h2><h4>../test/test_block_cache.cpp:470</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(69)">../test/test_block_cache.cpp:471</a></td><td>test evicting dirty pieces</td></tr><tr id="69" style="display: none;" colspan="3"><td colspan="3"><h2>test evicting dirty pieces</h2><h4>../test/test_block_cache.cpp:471</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(70)">../test/test_block_cache.cpp:472</a></td><td>test free_piece</td></tr><tr id="70" style="display: none;" colspan="3"><td colspan="3"><h2>test free_piece</h2><h4>../test/test_block_cache.cpp:472</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(71)">../test/test_block_cache.cpp:473</a></td><td>test abort_dirty</td></tr><tr id="71" style="display: none;" colspan="3"><td colspan="3"><h2>test abort_dirty</h2><h4>../test/test_block_cache.cpp:473</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(72)">../test/test_block_cache.cpp:474</a></td><td>test unaligned reads</td></tr><tr id="72" style="display: none;" colspan="3"><td colspan="3"><h2>test unaligned reads</h2><h4>../test/test_block_cache.cpp:474</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// it's supposed to be a cache hit
 	TEST_CHECK(ret &gt;= 0);
 	// return the reference to the buffer we just read
 	RETURN_BUFFER;
@@ -3298,8 +3429,7 @@ int test_main()
 <div style="background: #ffff00" width="100%">	return 0;
 </div>}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(71)">../test/test_dht.cpp:438</a></td><td>test obfuscated_get_peers</td></tr><tr id="71" style="display: none;" colspan="3"><td colspan="3"><h2>test obfuscated_get_peers</h2><h4>../test/test_dht.cpp:438</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	}
-	return false;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(73)">../test/test_dht.cpp:439</a></td><td>test obfuscated_get_peers</td></tr><tr id="73" style="display: none;" colspan="3"><td colspan="3"><h2>test obfuscated_get_peers</h2><h4>../test/test_dht.cpp:439</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	return false;
 }
 
 struct obs : dht::dht_observer
@@ -3316,6 +3446,7 @@ struct obs : dht::dht_observer
 	virtual void outgoing_get_peers(sha1_hash const&amp; target
 		, sha1_hash const&amp; sent_target, udp::endpoint const&amp; ep) TORRENT_OVERRIDE {}
 	virtual void announce(sha1_hash const&amp; ih, address const&amp; addr, int port) TORRENT_OVERRIDE {}
+	virtual void log(dht_logger::dht_module_t l, char const* fmt, ...) TORRENT_OVERRIDE {}
 };
 
 <div style="background: #ffff00" width="100%">int test_main()
@@ -3349,7 +3480,7 @@ struct obs : dht::dht_observer
 	fprintf(stderr, "msg: %s\n", print_entry(response).c_str());
 	ret = dht::verify_message(response, pong_desc, parsed, 4, error_string
 		, sizeof(error_string));
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(72)">../test/test_file_storage.cpp:210</a></td><td>test file_storage::optimize too</td></tr><tr id="72" style="display: none;" colspan="3"><td colspan="3"><h2>test file_storage::optimize too</h2><h4>../test/test_file_storage.cpp:210</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(73)">../test/test_file_storage.cpp:211</a></td><td>test map_block</td></tr><tr id="73" style="display: none;" colspan="3"><td colspan="3"><h2>test map_block</h2><h4>../test/test_file_storage.cpp:211</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(74)">../test/test_file_storage.cpp:212</a></td><td>test piece_size(int piece)</td></tr><tr id="74" style="display: none;" colspan="3"><td colspan="3"><h2>test piece_size(int piece)</h2><h4>../test/test_file_storage.cpp:212</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(75)">../test/test_file_storage.cpp:213</a></td><td>test file_index_at_offset</td></tr><tr id="75" style="display: none;" colspan="3"><td colspan="3"><h2>test file_index_at_offset</h2><h4>../test/test_file_storage.cpp:213</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(76)">../test/test_file_storage.cpp:214</a></td><td>test file attributes</td></tr><tr id="76" style="display: none;" colspan="3"><td colspan="3"><h2>test file attributes</h2><h4>../test/test_file_storage.cpp:214</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(77)">../test/test_file_storage.cpp:215</a></td><td>test symlinks</td></tr><tr id="77" style="display: none;" colspan="3"><td colspan="3"><h2>test symlinks</h2><h4>../test/test_file_storage.cpp:215</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(78)">../test/test_file_storage.cpp:216</a></td><td>test pad_files</td></tr><tr id="78" style="display: none;" colspan="3"><td colspan="3"><h2>test pad_files</h2><h4>../test/test_file_storage.cpp:216</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(79)">../test/test_file_storage.cpp:217</a></td><td>test reorder_file (make sure internal_file_entry::swap() is used)</td></tr><tr id="79" style="display: none;" colspan="3"><td colspan="3"><h2>test reorder_file (make sure internal_file_entry::swap() is used)</h2><h4>../test/test_file_storage.cpp:217</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		TEST_EQUAL(rq.piece, 7);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(74)">../test/test_file_storage.cpp:210</a></td><td>test file_storage::optimize too</td></tr><tr id="74" style="display: none;" colspan="3"><td colspan="3"><h2>test file_storage::optimize too</h2><h4>../test/test_file_storage.cpp:210</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(75)">../test/test_file_storage.cpp:211</a></td><td>test map_block</td></tr><tr id="75" style="display: none;" colspan="3"><td colspan="3"><h2>test map_block</h2><h4>../test/test_file_storage.cpp:211</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(76)">../test/test_file_storage.cpp:212</a></td><td>test piece_size(int piece)</td></tr><tr id="76" style="display: none;" colspan="3"><td colspan="3"><h2>test piece_size(int piece)</h2><h4>../test/test_file_storage.cpp:212</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(77)">../test/test_file_storage.cpp:213</a></td><td>test file_index_at_offset</td></tr><tr id="77" style="display: none;" colspan="3"><td colspan="3"><h2>test file_index_at_offset</h2><h4>../test/test_file_storage.cpp:213</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(78)">../test/test_file_storage.cpp:214</a></td><td>test file attributes</td></tr><tr id="78" style="display: none;" colspan="3"><td colspan="3"><h2>test file attributes</h2><h4>../test/test_file_storage.cpp:214</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(79)">../test/test_file_storage.cpp:215</a></td><td>test symlinks</td></tr><tr id="79" style="display: none;" colspan="3"><td colspan="3"><h2>test symlinks</h2><h4>../test/test_file_storage.cpp:215</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(80)">../test/test_file_storage.cpp:216</a></td><td>test pad_files</td></tr><tr id="80" style="display: none;" colspan="3"><td colspan="3"><h2>test pad_files</h2><h4>../test/test_file_storage.cpp:216</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(81)">../test/test_file_storage.cpp:217</a></td><td>test reorder_file (make sure internal_file_entry::swap() is used)</td></tr><tr id="81" style="display: none;" colspan="3"><td colspan="3"><h2>test reorder_file (make sure internal_file_entry::swap() is used)</h2><h4>../test/test_file_storage.cpp:217</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		TEST_EQUAL(rq.piece, 7);
 		TEST_EQUAL(rq.start, 298);
 		TEST_EQUAL(rq.length, 841);
 	}
@@ -3373,7 +3504,7 @@ struct obs : dht::dht_observer
 </div>	return 0;
 }
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(80)">../test/test_metadata_extension.cpp:93</a></td><td>it would be nice to test reversing which session is making the connection as well</td></tr><tr id="80" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to test reversing
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(82)">../test/test_metadata_extension.cpp:93</a></td><td>it would be nice to test reversing which session is making the connection as well</td></tr><tr id="82" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to test reversing
 which session is making the connection as well</h2><h4>../test/test_metadata_extension.cpp:93</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	, int timeout)
 {
 	using namespace libtorrent;
@@ -3425,7 +3556,7 @@ which session is making the connection as well</h2><h4>../test/test_metadata_ext
 	ses1.apply_settings(pack);
 	ses2.apply_settings(pack);
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(81)">../test/test_peer_list.cpp:921</a></td><td>test erasing peers</td></tr><tr id="81" style="display: none;" colspan="3"><td colspan="3"><h2>test erasing peers</h2><h4>../test/test_peer_list.cpp:921</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(82)">../test/test_peer_list.cpp:922</a></td><td>test update_peer_port with allow_multiple_connections_per_ip and without</td></tr><tr id="82" style="display: none;" colspan="3"><td colspan="3"><h2>test update_peer_port with allow_multiple_connections_per_ip and without</h2><h4>../test/test_peer_list.cpp:922</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(83)">../test/test_peer_list.cpp:923</a></td><td>test add i2p peers</td></tr><tr id="83" style="display: none;" colspan="3"><td colspan="3"><h2>test add i2p peers</h2><h4>../test/test_peer_list.cpp:923</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(84)">../test/test_peer_list.cpp:924</a></td><td>test allow_i2p_mixed</td></tr><tr id="84" style="display: none;" colspan="3"><td colspan="3"><h2>test allow_i2p_mixed</h2><h4>../test/test_peer_list.cpp:924</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(85)">../test/test_peer_list.cpp:925</a></td><td>test insert_peer failing with all error conditions</td></tr><tr id="85" style="display: none;" colspan="3"><td colspan="3"><h2>test insert_peer failing with all error conditions</h2><h4>../test/test_peer_list.cpp:925</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(86)">../test/test_peer_list.cpp:926</a></td><td>test IPv6</td></tr><tr id="86" style="display: none;" colspan="3"><td colspan="3"><h2>test IPv6</h2><h4>../test/test_peer_list.cpp:926</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(87)">../test/test_peer_list.cpp:927</a></td><td>test connect_to_peer() failing</td></tr><tr id="87" style="display: none;" colspan="3"><td colspan="3"><h2>test connect_to_peer() failing</h2><h4>../test/test_peer_list.cpp:927</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(88)">../test/test_peer_list.cpp:928</a></td><td>test connection_closed</td></tr><tr id="88" style="display: none;" colspan="3"><td colspan="3"><h2>test connection_closed</h2><h4>../test/test_peer_list.cpp:928</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(89)">../test/test_peer_list.cpp:929</a></td><td>connect candidates recalculation when incrementing failcount</td></tr><tr id="89" style="display: none;" colspan="3"><td colspan="3"><h2>connect candidates recalculation when incrementing failcount</h2><h4>../test/test_peer_list.cpp:929</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		torrent_peer* peer4 = add_peer(p, st, ep("10.0.0.4", 8080));
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(83)">../test/test_peer_list.cpp:921</a></td><td>test erasing peers</td></tr><tr id="83" style="display: none;" colspan="3"><td colspan="3"><h2>test erasing peers</h2><h4>../test/test_peer_list.cpp:921</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(84)">../test/test_peer_list.cpp:922</a></td><td>test update_peer_port with allow_multiple_connections_per_ip and without</td></tr><tr id="84" style="display: none;" colspan="3"><td colspan="3"><h2>test update_peer_port with allow_multiple_connections_per_ip and without</h2><h4>../test/test_peer_list.cpp:922</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(85)">../test/test_peer_list.cpp:923</a></td><td>test add i2p peers</td></tr><tr id="85" style="display: none;" colspan="3"><td colspan="3"><h2>test add i2p peers</h2><h4>../test/test_peer_list.cpp:923</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(86)">../test/test_peer_list.cpp:924</a></td><td>test allow_i2p_mixed</td></tr><tr id="86" style="display: none;" colspan="3"><td colspan="3"><h2>test allow_i2p_mixed</h2><h4>../test/test_peer_list.cpp:924</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(87)">../test/test_peer_list.cpp:925</a></td><td>test insert_peer failing with all error conditions</td></tr><tr id="87" style="display: none;" colspan="3"><td colspan="3"><h2>test insert_peer failing with all error conditions</h2><h4>../test/test_peer_list.cpp:925</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(88)">../test/test_peer_list.cpp:926</a></td><td>test IPv6</td></tr><tr id="88" style="display: none;" colspan="3"><td colspan="3"><h2>test IPv6</h2><h4>../test/test_peer_list.cpp:926</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(89)">../test/test_peer_list.cpp:927</a></td><td>test connect_to_peer() failing</td></tr><tr id="89" style="display: none;" colspan="3"><td colspan="3"><h2>test connect_to_peer() failing</h2><h4>../test/test_peer_list.cpp:927</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(90)">../test/test_peer_list.cpp:928</a></td><td>test connection_closed</td></tr><tr id="90" style="display: none;" colspan="3"><td colspan="3"><h2>test connection_closed</h2><h4>../test/test_peer_list.cpp:928</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(91)">../test/test_peer_list.cpp:929</a></td><td>connect candidates recalculation when incrementing failcount</td></tr><tr id="91" style="display: none;" colspan="3"><td colspan="3"><h2>connect candidates recalculation when incrementing failcount</h2><h4>../test/test_peer_list.cpp:929</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		torrent_peer* peer4 = add_peer(p, st, ep("10.0.0.4", 8080));
 		TEST_CHECK(peer4);
 		TEST_EQUAL(p.num_peers(), 4);
 		torrent_peer* peer5 = add_peer(p, st, ep("10.0.0.5", 8080));
@@ -3449,7 +3580,7 @@ which session is making the connection as well</h2><h4>../test/test_metadata_ext
 </div>	return 0;
 }
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(90)">../test/test_primitives.cpp:212</a></td><td>test the case where we have > 120 samples (and have the base delay actually be updated)</td></tr><tr id="90" style="display: none;" colspan="3"><td colspan="3"><h2>test the case where we have > 120 samples (and have the base delay actually be updated)</h2><h4>../test/test_primitives.cpp:212</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(91)">../test/test_primitives.cpp:213</a></td><td>test the case where a sample is lower than the history entry but not lower than the base</td></tr><tr id="91" style="display: none;" colspan="3"><td colspan="3"><h2>test the case where a sample is lower than the history entry but not lower than the base</h2><h4>../test/test_primitives.cpp:213</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TEST_CHECK(!filter.find(k3));
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(92)">../test/test_primitives.cpp:212</a></td><td>test the case where we have > 120 samples (and have the base delay actually be updated)</td></tr><tr id="92" style="display: none;" colspan="3"><td colspan="3"><h2>test the case where we have > 120 samples (and have the base delay actually be updated)</h2><h4>../test/test_primitives.cpp:212</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(93)">../test/test_primitives.cpp:213</a></td><td>test the case where a sample is lower than the history entry but not lower than the base</td></tr><tr id="93" style="display: none;" colspan="3"><td colspan="3"><h2>test the case where a sample is lower than the history entry but not lower than the base</h2><h4>../test/test_primitives.cpp:213</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TEST_CHECK(!filter.find(k3));
 	TEST_CHECK(filter.find(k4));
 
 	// test timestamp_history
@@ -3500,7 +3631,7 @@ which session is making the connection as well</h2><h4>../test/test_metadata_ext
 	sanitize_append_path_element(path, "a...b", 5);
 	TEST_EQUAL(path, "a...b");
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(92)">../test/test_resolve_links.cpp:80</a></td><td>test files with different piece size (negative test)</td></tr><tr id="92" style="display: none;" colspan="3"><td colspan="3"><h2>test files with different piece size (negative test)</h2><h4>../test/test_resolve_links.cpp:80</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{ "test2", "test1_pad_files", 0},
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(94)">../test/test_resolve_links.cpp:80</a></td><td>test files with different piece size (negative test)</td></tr><tr id="94" style="display: none;" colspan="3"><td colspan="3"><h2>test files with different piece size (negative test)</h2><h4>../test/test_resolve_links.cpp:80</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{ "test2", "test1_pad_files", 0},
 	{ "test3", "test1_pad_files", 0},
 	{ "test2", "test1_single", 0},
 
@@ -3522,7 +3653,7 @@ which session is making the connection as well</h2><h4>../test/test_metadata_ext
 
 <div style="background: #ffff00" width="100%">};
 </div>
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(93)">../test/test_resolve_links.cpp:83</a></td><td>it would be nice to test resolving of more than just 2 files as well. like 3 single file torrents merged into one, resolving all 3 files.</td></tr><tr id="93" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to test resolving of more than just 2 files as well.
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(95)">../test/test_resolve_links.cpp:83</a></td><td>it would be nice to test resolving of more than just 2 files as well. like 3 single file torrents merged into one, resolving all 3 files.</td></tr><tr id="95" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to test resolving of more than just 2 files as well.
 like 3 single file torrents merged into one, resolving all 3 files.</h2><h4>../test/test_resolve_links.cpp:83</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{ "test2", "test1_single", 0},
 
 	// these are all padded. The first small file will accidentally also
@@ -3574,7 +3705,7 @@ like 3 single file torrents merged into one, resolving all 3 files.</h2><h4>../t
 
 		// some debug output in case the test fails
 		if (num_matches &gt; e.expected_matches)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(94)">../test/test_resume.cpp:340</a></td><td>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</td></tr><tr id="94" style="display: none;" colspan="3"><td colspan="3"><h2>test all other resume flags here too. This would require returning
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(96)">../test/test_resume.cpp:340</a></td><td>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</td></tr><tr id="96" style="display: none;" colspan="3"><td colspan="3"><h2>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</h2><h4>../test/test_resume.cpp:340</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// resume data overrides the paused flag
 	fprintf(stderr, "flags: paused\n");
@@ -3600,7 +3731,7 @@ and trackers for instance</h2><h4>../test/test_resume.cpp:340</h4><pre style="ba
 </div>}
 
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(95)">../test/test_ssl.cpp:377</a></td><td>test using a signed certificate with the wrong info-hash in DN</td></tr><tr id="95" style="display: none;" colspan="3"><td colspan="3"><h2>test using a signed certificate with the wrong info-hash in DN</h2><h4>../test/test_ssl.cpp:377</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// in verifying peers
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(97)">../test/test_ssl.cpp:378</a></td><td>test using a signed certificate with the wrong info-hash in DN</td></tr><tr id="97" style="display: none;" colspan="3"><td colspan="3"><h2>test using a signed certificate with the wrong info-hash in DN</h2><h4>../test/test_ssl.cpp:378</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// in verifying peers
 	ctx.set_verify_mode(context::verify_none, ec);
 	if (ec)
 	{
@@ -3651,8 +3782,8 @@ and trackers for instance</h2><h4>../test/test_resume.cpp:340</h4><pre style="ba
 			return false;
 		}
 		fprintf(stderr, "use_tmp_dh_file \"%s\"\n", dh_params.c_str());
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(96)">../test/test_ssl.cpp:475</a></td><td>also test using a hash that refers to a valid torrent but that differs from the SNI hash</td></tr><tr id="96" style="display: none;" colspan="3"><td colspan="3"><h2>also test using a hash that refers to a valid torrent
-but that differs from the SNI hash</h2><h4>../test/test_ssl.cpp:475</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	print_alerts(ses1, "ses1", true, true, true, &amp;on_alert);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(98)">../test/test_ssl.cpp:476</a></td><td>also test using a hash that refers to a valid torrent but that differs from the SNI hash</td></tr><tr id="98" style="display: none;" colspan="3"><td colspan="3"><h2>also test using a hash that refers to a valid torrent
+but that differs from the SNI hash</h2><h4>../test/test_ssl.cpp:476</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	print_alerts(ses1, "ses1", true, true, true, &amp;on_alert);
 	if (ec)
 	{
 		fprintf(stderr, "Failed SSL handshake: %s\n"
@@ -3703,7 +3834,7 @@ but that differs from the SNI hash</h2><h4>../test/test_ssl.cpp:475</h4><pre sty
 	{
 		fprintf(stderr, "invalid bittorrent handshake\n");
 		return false;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(97)">../test/test_torrent.cpp:133</a></td><td>wait for an alert rather than just waiting 10 seconds. This is kind of silly</td></tr><tr id="97" style="display: none;" colspan="3"><td colspan="3"><h2>wait for an alert rather than just waiting 10 seconds. This is kind of silly</h2><h4>../test/test_torrent.cpp:133</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			TEST_EQUAL(h.file_priorities().size(), info-&gt;num_files());
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(99)">../test/test_torrent.cpp:133</a></td><td>wait for an alert rather than just waiting 10 seconds. This is kind of silly</td></tr><tr id="99" style="display: none;" colspan="3"><td colspan="3"><h2>wait for an alert rather than just waiting 10 seconds. This is kind of silly</h2><h4>../test/test_torrent.cpp:133</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			TEST_EQUAL(h.file_priorities().size(), info-&gt;num_files());
 			TEST_EQUAL(h.file_priorities()[0], 0);
 			if (info-&gt;num_files() &gt; 1)
 				TEST_EQUAL(h.file_priorities()[1], 0);
@@ -3754,7 +3885,7 @@ int test_main()
 		boost::int64_t file_size = 256 * 1024;
 		fs.add_file("test_torrent_dir2/tmp1", file_size);
 		fs.add_file("test_torrent_dir2/tmp2", file_size);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(98)">../test/test_torrent_info.cpp:160</a></td><td>test remap_files</td></tr><tr id="98" style="display: none;" colspan="3"><td colspan="3"><h2>test remap_files</h2><h4>../test/test_torrent_info.cpp:160</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(99)">../test/test_torrent_info.cpp:161</a></td><td>merkle torrents. specifically torrent_info::add_merkle_nodes and torrent with "root hash"</td></tr><tr id="99" style="display: none;" colspan="3"><td colspan="3"><h2>merkle torrents. specifically torrent_info::add_merkle_nodes and torrent with "root hash"</h2><h4>../test/test_torrent_info.cpp:161</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(100)">../test/test_torrent_info.cpp:162</a></td><td>torrent with 'p' (padfile) attribute</td></tr><tr id="100" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'p' (padfile) attribute</h2><h4>../test/test_torrent_info.cpp:162</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(101)">../test/test_torrent_info.cpp:163</a></td><td>torrent with 'h' (hidden) attribute</td></tr><tr id="101" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'h' (hidden) attribute</h2><h4>../test/test_torrent_info.cpp:163</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(102)">../test/test_torrent_info.cpp:164</a></td><td>torrent with 'x' (executable) attribute</td></tr><tr id="102" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'x' (executable) attribute</h2><h4>../test/test_torrent_info.cpp:164</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(103)">../test/test_torrent_info.cpp:165</a></td><td>torrent with 'l' (symlink) attribute</td></tr><tr id="103" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'l' (symlink) attribute</h2><h4>../test/test_torrent_info.cpp:165</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(104)">../test/test_torrent_info.cpp:166</a></td><td>creating a merkle torrent (torrent_info::build_merkle_list)</td></tr><tr id="104" style="display: none;" colspan="3"><td colspan="3"><h2>creating a merkle torrent (torrent_info::build_merkle_list)</h2><h4>../test/test_torrent_info.cpp:166</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(105)">../test/test_torrent_info.cpp:167</a></td><td>torrent with multiple trackers in multiple tiers, making sure we shuffle them (how do you test shuffling?, load it multiple times and make sure it's in different order at least once)</td></tr><tr id="105" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with multiple trackers in multiple tiers, making sure we shuffle them (how do you test shuffling?, load it multiple times and make sure it's in different order at least once)</h2><h4>../test/test_torrent_info.cpp:167</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(106)">../test/test_torrent_info.cpp:168</a></td><td>sanitize_append_path_element with all kinds of UTF-8 sequences, including invalid ones</td></tr><tr id="106" style="display: none;" colspan="3"><td colspan="3"><h2>sanitize_append_path_element with all kinds of UTF-8 sequences, including invalid ones</h2><h4>../test/test_torrent_info.cpp:168</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(107)">../test/test_torrent_info.cpp:169</a></td><td>torrents with a missing name</td></tr><tr id="107" style="display: none;" colspan="3"><td colspan="3"><h2>torrents with a missing name</h2><h4>../test/test_torrent_info.cpp:169</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(108)">../test/test_torrent_info.cpp:170</a></td><td>torrents with a zero-length name</td></tr><tr id="108" style="display: none;" colspan="3"><td colspan="3"><h2>torrents with a zero-length name</h2><h4>../test/test_torrent_info.cpp:170</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(109)">../test/test_torrent_info.cpp:171</a></td><td>torrents with a merkle tree and add_merkle_nodes</td></tr><tr id="109" style="display: none;" colspan="3"><td colspan="3"><h2>torrents with a merkle tree and add_merkle_nodes</h2><h4>../test/test_torrent_info.cpp:171</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(110)">../test/test_torrent_info.cpp:172</a></td><td>torrent with a non-dictionary info-section</td></tr><tr id="110" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with a non-dictionary info-section</h2><h4>../test/test_torrent_info.cpp:172</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(111)">../test/test_torrent_info.cpp:173</a></td><td>torrents with DHT nodes</td></tr><tr id="111" style="display: none;" colspan="3"><td colspan="3"><h2>torrents with DHT nodes</h2><h4>../test/test_torrent_info.cpp:173</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(112)">../test/test_torrent_info.cpp:174</a></td><td>torrent with url-list as a single string</td></tr><tr id="112" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with url-list as a single string</h2><h4>../test/test_torrent_info.cpp:174</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(113)">../test/test_torrent_info.cpp:175</a></td><td>torrent with http seed as a single string</td></tr><tr id="113" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with http seed as a single string</h2><h4>../test/test_torrent_info.cpp:175</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(114)">../test/test_torrent_info.cpp:176</a></td><td>torrent with a comment</td></tr><tr id="114" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with a comment</h2><h4>../test/test_torrent_info.cpp:176</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(115)">../test/test_torrent_info.cpp:177</a></td><td>torrent with an SSL cert</td></tr><tr id="115" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with an SSL cert</h2><h4>../test/test_torrent_info.cpp:177</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(116)">../test/test_torrent_info.cpp:178</a></td><td>torrent with attributes (executable and hidden)</td></tr><tr id="116" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with attributes (executable and hidden)</h2><h4>../test/test_torrent_info.cpp:178</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(117)">../test/test_torrent_info.cpp:179</a></td><td>torrent_info::add_tracker</td></tr><tr id="117" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info::add_tracker</h2><h4>../test/test_torrent_info.cpp:179</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(118)">../test/test_torrent_info.cpp:180</a></td><td>torrent_info::add_url_seed</td></tr><tr id="118" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info::add_url_seed</h2><h4>../test/test_torrent_info.cpp:180</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(119)">../test/test_torrent_info.cpp:181</a></td><td>torrent_info::add_http_seed</td></tr><tr id="119" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info::add_http_seed</h2><h4>../test/test_torrent_info.cpp:181</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(120)">../test/test_torrent_info.cpp:182</a></td><td>torrent_info::unload</td></tr><tr id="120" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info::unload</h2><h4>../test/test_torrent_info.cpp:182</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(121)">../test/test_torrent_info.cpp:183</a></td><td>torrent_info constructor that takes an invalid bencoded buffer</td></tr><tr id="121" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info constructor that takes an invalid bencoded buffer</h2><h4>../test/test_torrent_info.cpp:183</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(122)">../test/test_torrent_info.cpp:184</a></td><td>verify_encoding with a string that triggers character replacement</td></tr><tr id="122" style="display: none;" colspan="3"><td colspan="3"><h2>verify_encoding with a string that triggers character replacement</h2><h4>../test/test_torrent_info.cpp:184</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{ "invalid_info.torrent", errors::torrent_missing_info },
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(100)">../test/test_torrent_info.cpp:160</a></td><td>test remap_files</td></tr><tr id="100" style="display: none;" colspan="3"><td colspan="3"><h2>test remap_files</h2><h4>../test/test_torrent_info.cpp:160</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(101)">../test/test_torrent_info.cpp:161</a></td><td>merkle torrents. specifically torrent_info::add_merkle_nodes and torrent with "root hash"</td></tr><tr id="101" style="display: none;" colspan="3"><td colspan="3"><h2>merkle torrents. specifically torrent_info::add_merkle_nodes and torrent with "root hash"</h2><h4>../test/test_torrent_info.cpp:161</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(102)">../test/test_torrent_info.cpp:162</a></td><td>torrent with 'p' (padfile) attribute</td></tr><tr id="102" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'p' (padfile) attribute</h2><h4>../test/test_torrent_info.cpp:162</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(103)">../test/test_torrent_info.cpp:163</a></td><td>torrent with 'h' (hidden) attribute</td></tr><tr id="103" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'h' (hidden) attribute</h2><h4>../test/test_torrent_info.cpp:163</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(104)">../test/test_torrent_info.cpp:164</a></td><td>torrent with 'x' (executable) attribute</td></tr><tr id="104" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'x' (executable) attribute</h2><h4>../test/test_torrent_info.cpp:164</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(105)">../test/test_torrent_info.cpp:165</a></td><td>torrent with 'l' (symlink) attribute</td></tr><tr id="105" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'l' (symlink) attribute</h2><h4>../test/test_torrent_info.cpp:165</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(106)">../test/test_torrent_info.cpp:166</a></td><td>creating a merkle torrent (torrent_info::build_merkle_list)</td></tr><tr id="106" style="display: none;" colspan="3"><td colspan="3"><h2>creating a merkle torrent (torrent_info::build_merkle_list)</h2><h4>../test/test_torrent_info.cpp:166</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(107)">../test/test_torrent_info.cpp:167</a></td><td>torrent with multiple trackers in multiple tiers, making sure we shuffle them (how do you test shuffling?, load it multiple times and make sure it's in different order at least once)</td></tr><tr id="107" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with multiple trackers in multiple tiers, making sure we shuffle them (how do you test shuffling?, load it multiple times and make sure it's in different order at least once)</h2><h4>../test/test_torrent_info.cpp:167</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(108)">../test/test_torrent_info.cpp:168</a></td><td>sanitize_append_path_element with all kinds of UTF-8 sequences, including invalid ones</td></tr><tr id="108" style="display: none;" colspan="3"><td colspan="3"><h2>sanitize_append_path_element with all kinds of UTF-8 sequences, including invalid ones</h2><h4>../test/test_torrent_info.cpp:168</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(109)">../test/test_torrent_info.cpp:169</a></td><td>torrents with a missing name</td></tr><tr id="109" style="display: none;" colspan="3"><td colspan="3"><h2>torrents with a missing name</h2><h4>../test/test_torrent_info.cpp:169</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(110)">../test/test_torrent_info.cpp:170</a></td><td>torrents with a zero-length name</td></tr><tr id="110" style="display: none;" colspan="3"><td colspan="3"><h2>torrents with a zero-length name</h2><h4>../test/test_torrent_info.cpp:170</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(111)">../test/test_torrent_info.cpp:171</a></td><td>torrents with a merkle tree and add_merkle_nodes</td></tr><tr id="111" style="display: none;" colspan="3"><td colspan="3"><h2>torrents with a merkle tree and add_merkle_nodes</h2><h4>../test/test_torrent_info.cpp:171</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(112)">../test/test_torrent_info.cpp:172</a></td><td>torrent with a non-dictionary info-section</td></tr><tr id="112" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with a non-dictionary info-section</h2><h4>../test/test_torrent_info.cpp:172</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(113)">../test/test_torrent_info.cpp:173</a></td><td>torrents with DHT nodes</td></tr><tr id="113" style="display: none;" colspan="3"><td colspan="3"><h2>torrents with DHT nodes</h2><h4>../test/test_torrent_info.cpp:173</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(114)">../test/test_torrent_info.cpp:174</a></td><td>torrent with url-list as a single string</td></tr><tr id="114" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with url-list as a single string</h2><h4>../test/test_torrent_info.cpp:174</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(115)">../test/test_torrent_info.cpp:175</a></td><td>torrent with http seed as a single string</td></tr><tr id="115" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with http seed as a single string</h2><h4>../test/test_torrent_info.cpp:175</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(116)">../test/test_torrent_info.cpp:176</a></td><td>torrent with a comment</td></tr><tr id="116" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with a comment</h2><h4>../test/test_torrent_info.cpp:176</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(117)">../test/test_torrent_info.cpp:177</a></td><td>torrent with an SSL cert</td></tr><tr id="117" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with an SSL cert</h2><h4>../test/test_torrent_info.cpp:177</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(118)">../test/test_torrent_info.cpp:178</a></td><td>torrent with attributes (executable and hidden)</td></tr><tr id="118" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with attributes (executable and hidden)</h2><h4>../test/test_torrent_info.cpp:178</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(119)">../test/test_torrent_info.cpp:179</a></td><td>torrent_info::add_tracker</td></tr><tr id="119" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info::add_tracker</h2><h4>../test/test_torrent_info.cpp:179</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(120)">../test/test_torrent_info.cpp:180</a></td><td>torrent_info::add_url_seed</td></tr><tr id="120" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info::add_url_seed</h2><h4>../test/test_torrent_info.cpp:180</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(121)">../test/test_torrent_info.cpp:181</a></td><td>torrent_info::add_http_seed</td></tr><tr id="121" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info::add_http_seed</h2><h4>../test/test_torrent_info.cpp:181</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(122)">../test/test_torrent_info.cpp:182</a></td><td>torrent_info::unload</td></tr><tr id="122" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info::unload</h2><h4>../test/test_torrent_info.cpp:182</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(123)">../test/test_torrent_info.cpp:183</a></td><td>torrent_info constructor that takes an invalid bencoded buffer</td></tr><tr id="123" style="display: none;" colspan="3"><td colspan="3"><h2>torrent_info constructor that takes an invalid bencoded buffer</h2><h4>../test/test_torrent_info.cpp:183</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(124)">../test/test_torrent_info.cpp:184</a></td><td>verify_encoding with a string that triggers character replacement</td></tr><tr id="124" style="display: none;" colspan="3"><td colspan="3"><h2>verify_encoding with a string that triggers character replacement</h2><h4>../test/test_torrent_info.cpp:184</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{ "invalid_info.torrent", errors::torrent_missing_info },
 	{ "string.torrent", errors::torrent_is_no_dict },
 	{ "negative_size.torrent", errors::torrent_invalid_length },
 	{ "negative_file_size.torrent", errors::torrent_invalid_length },
@@ -3805,20 +3936,20 @@ namespace libtorrent
 		"abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_"
 		"abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_abcdefghi_"
 		"abcdefghi_abcdefghi_abcdefghi_abcdefghi_/"
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(123)">../test/test_tracker.cpp:198</a></td><td>test parse peers6</td></tr><tr id="123" style="display: none;" colspan="3"><td colspan="3"><h2>test parse peers6</h2><h4>../test/test_tracker.cpp:198</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(124)">../test/test_tracker.cpp:199</a></td><td>test parse tracker-id</td></tr><tr id="124" style="display: none;" colspan="3"><td colspan="3"><h2>test parse tracker-id</h2><h4>../test/test_tracker.cpp:199</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(125)">../test/test_tracker.cpp:200</a></td><td>test parse failure-reason</td></tr><tr id="125" style="display: none;" colspan="3"><td colspan="3"><h2>test parse failure-reason</h2><h4>../test/test_tracker.cpp:200</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(126)">../test/test_tracker.cpp:201</a></td><td>test all failure paths, including invalid bencoding not a dictionary no files entry in scrape response no info-hash entry in scrape response malformed peers in peer list of dictionaries uneven number of bytes in peers and peers6 string responses</td></tr><tr id="126" style="display: none;" colspan="3"><td colspan="3"><h2>test all failure paths, including
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(125)">../test/test_tracker.cpp:252</a></td><td>test parse peers6</td></tr><tr id="125" style="display: none;" colspan="3"><td colspan="3"><h2>test parse peers6</h2><h4>../test/test_tracker.cpp:252</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(126)">../test/test_tracker.cpp:253</a></td><td>test parse tracker-id</td></tr><tr id="126" style="display: none;" colspan="3"><td colspan="3"><h2>test parse tracker-id</h2><h4>../test/test_tracker.cpp:253</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(127)">../test/test_tracker.cpp:254</a></td><td>test parse failure-reason</td></tr><tr id="127" style="display: none;" colspan="3"><td colspan="3"><h2>test parse failure-reason</h2><h4>../test/test_tracker.cpp:254</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(128)">../test/test_tracker.cpp:255</a></td><td>test all failure paths, including invalid bencoding not a dictionary no files entry in scrape response no info-hash entry in scrape response malformed peers in peer list of dictionaries uneven number of bytes in peers and peers6 string responses</td></tr><tr id="128" style="display: none;" colspan="3"><td colspan="3"><h2>test all failure paths, including
 invalid bencoding
 not a dictionary
 no files entry in scrape response
 no info-hash entry in scrape response
 malformed peers in peer list of dictionaries
-uneven number of bytes in peers and peers6 string responses</h2><h4>../test/test_tracker.cpp:201</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TEST_EQUAL(ec, error_code());
-	TEST_EQUAL(resp.peers.size(), 0);
-	TEST_EQUAL(resp.external_ip, address_v6::from_string("f102:0304::ffff"));
+uneven number of bytes in peers and peers6 string responses</h2><h4>../test/test_tracker.cpp:255</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		peer_entry result = extract_peer("d7:peer id20:abababababababababab2:ip4:abcde"
+			, error_code(errors::invalid_tracker_response, get_libtorrent_category()), false);
+	}
 }
-#endif
 
 int test_main()
 {
+	test_extract_peer();
 	test_parse_hostname_peers();
 	test_parse_peers4();
 	test_parse_interval();
@@ -3862,7 +3993,7 @@ int test_main()
 	snprintf(tracker_url, sizeof(tracker_url), "http://127.0.0.1:%d/announce", http_port);
 	t-&gt;add_tracker(tracker_url, 0);
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(127)">../test/test_transfer.cpp:291</a></td><td>factor out the disk-full test into its own unit test</td></tr><tr id="127" style="display: none;" colspan="3"><td colspan="3"><h2>factor out the disk-full test into its own unit test</h2><h4>../test/test_transfer.cpp:291</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		print_alerts(ses1, "ses1", true, true, true, &amp;on_alert);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(129)">../test/test_transfer.cpp:291</a></td><td>factor out the disk-full test into its own unit test</td></tr><tr id="129" style="display: none;" colspan="3"><td colspan="3"><h2>factor out the disk-full test into its own unit test</h2><h4>../test/test_transfer.cpp:291</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		print_alerts(ses1, "ses1", true, true, true, &amp;on_alert);
 		print_alerts(ses2, "ses2", true, true, true, &amp;on_alert);
 
 		if (i % 10 == 0)
@@ -3913,7 +4044,7 @@ int test_main()
 			fprintf(stderr, "%s: discovered disk full mode. Raise limit and disable upload-mode\n", time_now_string());
 			peer_disconnects = 0;
 			continue;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(128)">../test/test_upnp.cpp:100</a></td><td>store the log and verify that some key messages are there</td></tr><tr id="128" style="display: none;" colspan="3"><td colspan="3"><h2>store the log and verify that some key messages are there</h2><h4>../test/test_upnp.cpp:100</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		"USN:uuid:000f-66d6-7296000099dc::upnp:rootdevice\r\n"
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(130)">../test/test_upnp.cpp:100</a></td><td>store the log and verify that some key messages are there</td></tr><tr id="130" style="display: none;" colspan="3"><td colspan="3"><h2>store the log and verify that some key messages are there</h2><h4>../test/test_upnp.cpp:100</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		"USN:uuid:000f-66d6-7296000099dc::upnp:rootdevice\r\n"
 		"Location: http://127.0.0.1:%d/upnp.xml\r\n"
 		"Server: Custom/1.0 UPnP/1.0 Proc/Ver\r\n"
 		"EXT:\r\n"
@@ -3964,7 +4095,7 @@ int run_upnp_test(char const* root_filename, char const* router_model, char cons
 	error_code ec;
 	load_file(root_filename, buf, ec);
 	buf.push_back(0);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(129)">../test/web_seed_suite.cpp:366</a></td><td>file hashes don't work with the new torrent creator reading async</td></tr><tr id="129" style="display: none;" colspan="3"><td colspan="3"><h2>file hashes don't work with the new torrent creator reading async</h2><h4>../test/web_seed_suite.cpp:366</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// corrupt the files now, so that the web seed will be banned
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(131)">../test/web_seed_suite.cpp:366</a></td><td>file hashes don't work with the new torrent creator reading async</td></tr><tr id="131" style="display: none;" colspan="3"><td colspan="3"><h2>file hashes don't work with the new torrent creator reading async</h2><h4>../test/web_seed_suite.cpp:366</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// corrupt the files now, so that the web seed will be banned
 		if (test_url_seed)
 		{
 			create_random_files(combine_path(save_path, "torrent_dir"), file_sizes, sizeof(file_sizes)/sizeof(file_sizes[0]));
@@ -4015,7 +4146,7 @@ int run_upnp_test(char const* root_filename, char const* router_model, char cons
 
 		test_transfer(ses, torrent_file, proxy, port, protocol, test_url_seed
 			, chunked_encoding, test_ban, keepalive);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(130)">../src/block_cache.cpp:959</a></td><td>it's somewhat expensive to iterate over this linked list. Presumably because of the random access of memory. It would be nice if pieces with no evictable blocks weren't in this list</td></tr><tr id="130" style="display: none;" colspan="3"><td colspan="3"><h2>it's somewhat expensive
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(132)">../src/block_cache.cpp:959</a></td><td>it's somewhat expensive to iterate over this linked list. Presumably because of the random access of memory. It would be nice if pieces with no evictable blocks weren't in this list</td></tr><tr id="132" style="display: none;" colspan="3"><td colspan="3"><h2>it's somewhat expensive
 to iterate over this linked list. Presumably because of the random
 access of memory. It would be nice if pieces with no evictable blocks
 weren't in this list</h2><h4>../src/block_cache.cpp:959</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	}
@@ -4069,7 +4200,7 @@ weren't in this list</h2><h4>../src/block_cache.cpp:959</h4><pre style="backgrou
 			{
 				cached_block_entry&amp; b = pe-&gt;blocks[j];
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(131)">../src/block_cache.cpp:1023</a></td><td>this should probably only be done every n:th time</td></tr><tr id="131" style="display: none;" colspan="3"><td colspan="3"><h2>this should probably only be done every n:th time</h2><h4>../src/block_cache.cpp:1023</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(133)">../src/block_cache.cpp:1023</a></td><td>this should probably only be done every n:th time</td></tr><tr id="133" style="display: none;" colspan="3"><td colspan="3"><h2>this should probably only be done every n:th time</h2><h4>../src/block_cache.cpp:1023</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			}
 
 			if (pe-&gt;ok_to_evict())
 			{
@@ -4120,7 +4251,7 @@ weren't in this list</h2><h4>../src/block_cache.cpp:959</h4><pre style="backgrou
 
 				int end = pe-&gt;blocks_in_piece;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(132)">../src/block_cache.cpp:1775</a></td><td>create a holder for refcounts that automatically decrement</td></tr><tr id="132" style="display: none;" colspan="3"><td colspan="3"><h2>create a holder for refcounts that automatically decrement</h2><h4>../src/block_cache.cpp:1775</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(134)">../src/block_cache.cpp:1775</a></td><td>create a holder for refcounts that automatically decrement</td></tr><tr id="134" style="display: none;" colspan="3"><td colspan="3"><h2>create a holder for refcounts that automatically decrement</h2><h4>../src/block_cache.cpp:1775</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	}
 
 	j-&gt;buffer = allocate_buffer("send buffer");
 	if (j-&gt;buffer == 0) return -2;
@@ -4171,7 +4302,7 @@ bool block_cache::maybe_free_piece(cached_piece_entry* pe)
 
 	boost::shared_ptr&lt;piece_manager&gt; s = pe-&gt;storage;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(133)">../src/bt_peer_connection.cpp:676</a></td><td>this could be optimized using knuth morris pratt</td></tr><tr id="133" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized using knuth morris pratt</h2><h4>../src/bt_peer_connection.cpp:676</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(135)">../src/bt_peer_connection.cpp:676</a></td><td>this could be optimized using knuth morris pratt</td></tr><tr id="135" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized using knuth morris pratt</h2><h4>../src/bt_peer_connection.cpp:676</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		}
 
 		m_rc4-&gt;set_incoming_key(&amp;remote_key[0], 20);
 		m_rc4-&gt;set_outgoing_key(&amp;local_key[0], 20);
@@ -4222,7 +4353,7 @@ bool block_cache::maybe_free_piece(cached_piece_entry* pe)
 // 		}
 
         // no complete sync
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(134)">../src/bt_peer_connection.cpp:2245</a></td><td>if we're finished, send upload_only message</td></tr><tr id="134" style="display: none;" colspan="3"><td colspan="3"><h2>if we're finished, send upload_only message</h2><h4>../src/bt_peer_connection.cpp:2245</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(136)">../src/bt_peer_connection.cpp:2245</a></td><td>if we're finished, send upload_only message</td></tr><tr id="136" style="display: none;" colspan="3"><td colspan="3"><h2>if we're finished, send upload_only message</h2><h4>../src/bt_peer_connection.cpp:2245</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		}
 		peer_log(peer_log_alert::outgoing_message, "BITFIELD"
 			, "%s", bitfield_string.c_str());
 #endif
@@ -4273,7 +4404,7 @@ bool block_cache::maybe_free_piece(cached_piece_entry* pe)
 				? m_settings.get_str(settings_pack::user_agent)
 				: m_settings.get_str(settings_pack::handshake_client_version);
 		}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(135)">../src/choker.cpp:336</a></td><td>optimize this using partial_sort or something. We don't need to sort the entire list</td></tr><tr id="135" style="display: none;" colspan="3"><td colspan="3"><h2>optimize this using partial_sort or something. We don't need
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(137)">../src/choker.cpp:336</a></td><td>optimize this using partial_sort or something. We don't need to sort the entire list</td></tr><tr id="137" style="display: none;" colspan="3"><td colspan="3"><h2>optimize this using partial_sort or something. We don't need
 to sort the entire list</h2><h4>../src/choker.cpp:336</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			return upload_slots;
 		}
 
@@ -4295,7 +4426,7 @@ to sort the entire list</h2><h4>../src/choker.cpp:336</h4><pre style="background
 			upload_slots = 0;
 
 <div style="background: #ffff00" width="100%">			
-</div></pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(136)">../src/choker.cpp:339</a></td><td>make the comparison function a free function and move it into this cpp file</td></tr><tr id="136" style="display: none;" colspan="3"><td colspan="3"><h2>make the comparison function a free function and move it
+</div></pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(138)">../src/choker.cpp:339</a></td><td>make the comparison function a free function and move it into this cpp file</td></tr><tr id="138" style="display: none;" colspan="3"><td colspan="3"><h2>make the comparison function a free function and move it
 into this cpp file</h2><h4>../src/choker.cpp:339</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		}
 
 		// ==== rate-based ====
@@ -4319,7 +4450,7 @@ into this cpp file</h2><h4>../src/choker.cpp:339</h4><pre style="background: #f6
 <div style="background: #ffff00" width="100%">			std::sort(peers.begin(), peers.end()
 </div>				, boost::bind(&amp;upload_rate_compare, _1, _2));
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(137)">../src/choker.cpp:344</a></td><td>make configurable</td></tr><tr id="137" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/choker.cpp:344</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(139)">../src/choker.cpp:344</a></td><td>make configurable</td></tr><tr id="139" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/choker.cpp:344</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		//
 		// The rate based unchoker looks at our upload rate to peers, and find
 		// a balance between number of upload slots and the rate we achieve. The
 		// intention is to not spread upload bandwidth too thin, but also to not
@@ -4352,7 +4483,7 @@ into this cpp file</h2><h4>../src/choker.cpp:339</h4><pre style="background: #f6
 
 				++upload_slots;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(138)">../src/choker.cpp:358</a></td><td>make configurable</td></tr><tr id="138" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/choker.cpp:358</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// it purely based on the current state of our peers.
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(140)">../src/choker.cpp:358</a></td><td>make configurable</td></tr><tr id="140" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/choker.cpp:358</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// it purely based on the current state of our peers.
 			upload_slots = 0;
 
 			
@@ -4403,7 +4534,7 @@ into this cpp file</h2><h4>../src/choker.cpp:339</h4><pre style="background: #f6
 		}
 		else if (sett.get_int(settings_pack::seed_choking_algorithm)
 			== settings_pack::anti_leech)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(139)">../src/create_torrent.cpp:284</a></td><td>this should probably be optional</td></tr><tr id="139" style="display: none;" colspan="3"><td colspan="3"><h2>this should probably be optional</h2><h4>../src/create_torrent.cpp:284</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		boost::shared_ptr&lt;char&gt; dummy;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(141)">../src/create_torrent.cpp:284</a></td><td>this should probably be optional</td></tr><tr id="141" style="display: none;" colspan="3"><td colspan="3"><h2>this should probably be optional</h2><h4>../src/create_torrent.cpp:284</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		boost::shared_ptr&lt;char&gt; dummy;
 		counters cnt;
 		disk_io_thread disk_thread(ios, cnt, 0);
 
@@ -4454,7 +4585,7 @@ into this cpp file</h2><h4>../src/choker.cpp:339</h4><pre style="background: #f6
 		, m_merkle_torrent((flags &amp; merkle) != 0)
 		, m_include_mtime((flags &amp; modification_time) != 0)
 		, m_include_symlinks((flags &amp; symlinks) != 0)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(140)">../src/disk_buffer_pool.cpp:319</a></td><td>perhaps we should sort the buffers here?</td></tr><tr id="140" style="display: none;" colspan="3"><td colspan="3"><h2>perhaps we should sort the buffers here?</h2><h4>../src/disk_buffer_pool.cpp:319</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		mutex::scoped_lock l(m_pool_mutex);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(142)">../src/disk_buffer_pool.cpp:319</a></td><td>perhaps we should sort the buffers here?</td></tr><tr id="142" style="display: none;" colspan="3"><td colspan="3"><h2>perhaps we should sort the buffers here?</h2><h4>../src/disk_buffer_pool.cpp:319</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		mutex::scoped_lock l(m_pool_mutex);
 		for (int i = 0; i &lt; iov_len; ++i)
 		{
 			iov[i].iov_base = allocate_buffer_impl(l, "pending read");
@@ -4505,7 +4636,7 @@ into this cpp file</h2><h4>../src/choker.cpp:339</h4><pre style="background: #f6
 			TORRENT_ASSERT(is_disk_buffer(ret, l));
 		}
 		else
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(141)">../src/disk_io_thread.cpp:857</a></td><td>it would be nice to optimize this by having the cache pieces also ordered by</td></tr><tr id="141" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to optimize this by having the cache
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(143)">../src/disk_io_thread.cpp:857</a></td><td>it would be nice to optimize this by having the cache pieces also ordered by</td></tr><tr id="143" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to optimize this by having the cache
 pieces also ordered by</h2><h4>../src/disk_io_thread.cpp:857</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// from disk_io_thread::do_delete, which is a fence job and should
 			// have any other jobs active, i.e. there should not be any references
 			// keeping pieces or blocks alive
@@ -4557,7 +4688,7 @@ pieces also ordered by</h2><h4>../src/disk_io_thread.cpp:857</h4><pre style="bac
 		std::vector&lt;std::pair&lt;piece_manager*, int&gt; &gt; pieces;
 		pieces.reserve(m_disk_cache.num_write_lru_pieces());
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(142)">../src/disk_io_thread.cpp:900</a></td><td>instead of doing a lookup each time through the loop, save cached_piece_entry pointers with piece_refcount incremented to pin them</td></tr><tr id="142" style="display: none;" colspan="3"><td colspan="3"><h2>instead of doing a lookup each time through the loop, save
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(144)">../src/disk_io_thread.cpp:900</a></td><td>instead of doing a lookup each time through the loop, save cached_piece_entry pointers with piece_refcount incremented to pin them</td></tr><tr id="144" style="display: none;" colspan="3"><td colspan="3"><h2>instead of doing a lookup each time through the loop, save
 cached_piece_entry pointers with piece_refcount incremented to pin them</h2><h4>../src/disk_io_thread.cpp:900</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// this is why we pass in 1 as cont_block to the flushing functions
 	void disk_io_thread::try_flush_write_blocks(int num, tailqueue&amp; completed_jobs
 		, mutex::scoped_lock&amp; l)
@@ -4609,7 +4740,7 @@ cached_piece_entry pointers with piece_refcount incremented to pin them</h2><h4>
 			cached_piece_entry* pe = m_disk_cache.find_piece(i-&gt;first, i-&gt;second);
 			if (pe == NULL) continue;
 			if (pe-&gt;num_dirty == 0) continue;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(143)">../src/disk_io_thread.cpp:1079</a></td><td>instead of doing this. pass in the settings to each storage_interface call. Each disk thread could hold its most recent understanding of the settings in a shared_ptr, and update it every time it wakes up from a job. That way each access to the settings won't require a mutex to be held.</td></tr><tr id="143" style="display: none;" colspan="3"><td colspan="3"><h2>instead of doing this. pass in the settings to each storage_interface
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(145)">../src/disk_io_thread.cpp:1079</a></td><td>instead of doing this. pass in the settings to each storage_interface call. Each disk thread could hold its most recent understanding of the settings in a shared_ptr, and update it every time it wakes up from a job. That way each access to the settings won't require a mutex to be held.</td></tr><tr id="145" style="display: none;" colspan="3"><td colspan="3"><h2>instead of doing this. pass in the settings to each storage_interface
 call. Each disk thread could hold its most recent understanding of the settings
 in a shared_ptr, and update it every time it wakes up from a job. That way
 each access to the settings won't require a mutex to be held.</h2><h4>../src/disk_io_thread.cpp:1079</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
@@ -4656,7 +4787,7 @@ each access to the settings won't require a mutex to be held.</h2><h4>../src/dis
 			// our quanta in case there aren't any other
 			// jobs to run in between
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(144)">../src/disk_io_thread.cpp:1107</a></td><td>a potentially more efficient solution would be to have a special queue for retry jobs, that's only ever run when a job completes, in any thread. It would only work if counters::num_running_disk_jobs > 0</td></tr><tr id="144" style="display: none;" colspan="3"><td colspan="3"><h2>a potentially more efficient solution would be to have a special
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(146)">../src/disk_io_thread.cpp:1107</a></td><td>a potentially more efficient solution would be to have a special queue for retry jobs, that's only ever run when a job completes, in any thread. It would only work if counters::num_running_disk_jobs > 0</td></tr><tr id="146" style="display: none;" colspan="3"><td colspan="3"><h2>a potentially more efficient solution would be to have a special
 queue for retry jobs, that's only ever run when a job completes, in
 any thread. It would only work if counters::num_running_disk_jobs > 0</h2><h4>../src/disk_io_thread.cpp:1107</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		time_point start_time = clock_type::now();
@@ -4689,7 +4820,7 @@ any thread. It would only work if counters::num_running_disk_jobs > 0</h2><h4>..
 		}
 
 #if TORRENT_USE_ASSERT
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(145)">../src/disk_io_thread.cpp:1121</a></td><td>it should clear the hash state even when there's an error, right?</td></tr><tr id="145" style="display: none;" colspan="3"><td colspan="3"><h2>it should clear the hash state even when there's an error, right?</h2><h4>../src/disk_io_thread.cpp:1121</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_stats_counters.inc_stats_counter(counters::num_running_disk_jobs, -1);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(147)">../src/disk_io_thread.cpp:1121</a></td><td>it should clear the hash state even when there's an error, right?</td></tr><tr id="147" style="display: none;" colspan="3"><td colspan="3"><h2>it should clear the hash state even when there's an error, right?</h2><h4>../src/disk_io_thread.cpp:1121</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_stats_counters.inc_stats_counter(counters::num_running_disk_jobs, -1);
 
 		if (ret == retry_job)
 		{
@@ -4740,7 +4871,7 @@ any thread. It would only work if counters::num_running_disk_jobs > 0</h2><h4>..
 			j-&gt;error.operation = storage_error::alloc_cache_piece;
 			return -1;
 		}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(146)">../src/disk_io_thread.cpp:1819</a></td><td>maybe the tailqueue_iterator should contain a pointer-pointer instead and have an unlink function</td></tr><tr id="146" style="display: none;" colspan="3"><td colspan="3"><h2>maybe the tailqueue_iterator should contain a pointer-pointer
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(148)">../src/disk_io_thread.cpp:1819</a></td><td>maybe the tailqueue_iterator should contain a pointer-pointer instead and have an unlink function</td></tr><tr id="148" style="display: none;" colspan="3"><td colspan="3"><h2>maybe the tailqueue_iterator should contain a pointer-pointer
 instead and have an unlink function</h2><h4>../src/disk_io_thread.cpp:1819</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		j-&gt;callback = handler;
 
 		add_fence_job(storage, j);
@@ -4792,7 +4923,7 @@ instead and have an unlink function</h2><h4>../src/disk_io_thread.cpp:1819</h4><
 
 		if (completed_jobs.size())
 			add_completed_jobs(completed_jobs);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(147)">../src/disk_io_thread.cpp:2081</a></td><td>this is potentially very expensive. One way to solve it would be to have a fence for just this one piece.</td></tr><tr id="147" style="display: none;" colspan="3"><td colspan="3"><h2>this is potentially very expensive. One way to solve
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(149)">../src/disk_io_thread.cpp:2081</a></td><td>this is potentially very expensive. One way to solve it would be to have a fence for just this one piece.</td></tr><tr id="149" style="display: none;" colspan="3"><td colspan="3"><h2>this is potentially very expensive. One way to solve
 it would be to have a fence for just this one piece.</h2><h4>../src/disk_io_thread.cpp:2081</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	}
 
 	void disk_io_thread::async_clear_piece(piece_manager* storage, int index
@@ -4844,7 +4975,7 @@ it would be to have a fence for just this one piece.</h2><h4>../src/disk_io_thre
 		if (!pe-&gt;hash) return;
 		if (pe-&gt;hashing) return;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(148)">../src/disk_io_thread.cpp:2342</a></td><td>we should probably just hang the job on the piece and make sure the hasher gets kicked</td></tr><tr id="148" style="display: none;" colspan="3"><td colspan="3"><h2>we should probably just hang the job on the piece and make sure the hasher gets kicked</h2><h4>../src/disk_io_thread.cpp:2342</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (pe == NULL)
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(150)">../src/disk_io_thread.cpp:2342</a></td><td>we should probably just hang the job on the piece and make sure the hasher gets kicked</td></tr><tr id="150" style="display: none;" colspan="3"><td colspan="3"><h2>we should probably just hang the job on the piece and make sure the hasher gets kicked</h2><h4>../src/disk_io_thread.cpp:2342</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (pe == NULL)
 		{
 			int cache_state = (j-&gt;flags &amp; disk_io_job::volatile_read)
 				? cached_piece_entry::volatile_read_lru
@@ -4895,7 +5026,7 @@ it would be to have a fence for just this one piece.</h2><h4>../src/disk_io_thre
 		TORRENT_PIECE_ASSERT(ph-&gt;offset % block_size == 0, pe);
 		for (int i = ph-&gt;offset / block_size; i &lt; blocks_in_piece; ++i)
 		{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(149)">../src/disk_io_thread.cpp:2409</a></td><td>introduce a holder class that automatically increments and decrements the piece_refcount</td></tr><tr id="149" style="display: none;" colspan="3"><td colspan="3"><h2>introduce a holder class that automatically increments
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(151)">../src/disk_io_thread.cpp:2409</a></td><td>introduce a holder class that automatically increments and decrements the piece_refcount</td></tr><tr id="151" style="display: none;" colspan="3"><td colspan="3"><h2>introduce a holder class that automatically increments
 and decrements the piece_refcount</h2><h4>../src/disk_io_thread.cpp:2409</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
 			file::iovec_t iov;
 			iov.iov_len = (std::min)(block_size, piece_size - ph-&gt;offset);
@@ -4947,7 +5078,7 @@ and decrements the piece_refcount</h2><h4>../src/disk_io_thread.cpp:2409</h4><pr
 					l.lock();
 					break;
 				}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(150)">../src/disk_io_thread.cpp:2655</a></td><td>it would be nice to not have to lock the mutex every turn through this loop</td></tr><tr id="150" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to not have to lock the mutex every
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(152)">../src/disk_io_thread.cpp:2655</a></td><td>it would be nice to not have to lock the mutex every turn through this loop</td></tr><tr id="152" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to not have to lock the mutex every
 turn through this loop</h2><h4>../src/disk_io_thread.cpp:2655</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			j-&gt;error.ec = error::no_memory;
 			j-&gt;error.operation = storage_error::alloc_cache_piece;
 			return -1;
@@ -4999,7 +5130,7 @@ turn through this loop</h2><h4>../src/disk_io_thread.cpp:2655</h4><pre style="ba
 			if (ret &lt; 0)
 			{
 				l.lock();
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(151)">../src/http_tracker_connection.cpp:184</a></td><td>support this somehow</td></tr><tr id="151" style="display: none;" colspan="3"><td colspan="3"><h2>support this somehow</h2><h4>../src/http_tracker_connection.cpp:184</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				url += escape_string(id.c_str(), id.length());
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(153)">../src/http_tracker_connection.cpp:184</a></td><td>support this somehow</td></tr><tr id="153" style="display: none;" colspan="3"><td colspan="3"><h2>support this somehow</h2><h4>../src/http_tracker_connection.cpp:184</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				url += escape_string(id.c_str(), id.length());
 			}
 
 #if TORRENT_USE_I2P
@@ -5050,7 +5181,7 @@ turn through this loop</h2><h4>../src/disk_io_thread.cpp:2655</h4><pre style="ba
 		// to avoid being blocked for slow or failing responses. Chances
 		// are that we're shutting down, and this should be a best-effort
 		// attempt. It's not worth stalling shutdown.
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(152)">../src/metadata_transfer.cpp:356</a></td><td>this is not safe. The torrent could be unloaded while we're still sending the metadata</td></tr><tr id="152" style="display: none;" colspan="3"><td colspan="3"><h2>this is not safe. The torrent could be unloaded while
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(154)">../src/metadata_transfer.cpp:356</a></td><td>this is not safe. The torrent could be unloaded while we're still sending the metadata</td></tr><tr id="154" style="display: none;" colspan="3"><td colspan="3"><h2>this is not safe. The torrent could be unloaded while
 we're still sending the metadata</h2><h4>../src/metadata_transfer.cpp:356</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					= req_to_offset(req, (int)m_tp.metadata().left());
 
 				char msg[15];
@@ -5102,7 +5233,7 @@ we're still sending the metadata</h2><h4>../src/metadata_transfer.cpp:356</h4><p
 			if (m_message_index == 0) return false;
 
 			if (length &gt; 500 * 1024)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(153)">../src/packet_buffer.cpp:176</a></td><td>use compare_less_wrap for this comparison as well</td></tr><tr id="153" 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(155)">../src/packet_buffer.cpp:176</a></td><td>use compare_less_wrap for this comparison as well</td></tr><tr id="155" 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);
@@ -5153,7 +5284,7 @@ we're still sending the metadata</h2><h4>../src/metadata_transfer.cpp:356</h4><p
 				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(154)">../src/part_file.cpp:252</a></td><td>what do we do if someone is currently reading from the disk from this piece? does it matter? Since we won't actively erase the data from disk, but it may be overwritten soon, it's probably not that big of a deal</td></tr><tr id="154" style="display: none;" colspan="3"><td colspan="3"><h2>what do we do if someone is currently reading from the disk
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(156)">../src/part_file.cpp:252</a></td><td>what do we do if someone is currently reading from the disk from this piece? does it matter? Since we won't actively erase the data from disk, but it may be overwritten soon, it's probably not that big of a deal</td></tr><tr id="156" style="display: none;" colspan="3"><td colspan="3"><h2>what do we do if someone is currently reading from the disk
 from this piece? does it matter? Since we won't actively erase the
 data from disk, but it may be overwritten soon, it's probably not that
 big of a deal</h2><h4>../src/part_file.cpp:252</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (((mode &amp; file::rw_mask) != file::read_only)
@@ -5207,7 +5338,7 @@ big of a deal</h2><h4>../src/part_file.cpp:252</h4><pre style="background: #f6f6
 				remove(old_path, ec);
 			}
 		}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(155)">../src/part_file.cpp:350</a></td><td>instead of rebuilding the whole file header and flushing it, update the slot entries as we go</td></tr><tr id="155" style="display: none;" colspan="3"><td colspan="3"><h2>instead of rebuilding the whole file header
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(157)">../src/part_file.cpp:350</a></td><td>instead of rebuilding the whole file header and flushing it, update the slot entries as we go</td></tr><tr id="157" style="display: none;" colspan="3"><td colspan="3"><h2>instead of rebuilding the whole file header
 and flushing it, update the slot entries as we go</h2><h4>../src/part_file.cpp:350</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (block_to_copy == m_piece_size)
 				{
 					m_free_slots.push_back(i-&gt;second);
@@ -5259,17 +5390,17 @@ and flushing it, update the slot entries as we go</h2><h4>../src/part_file.cpp:3
 		write_uint32(m_max_pieces, ptr);
 		write_uint32(m_piece_size, ptr);
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(156)">../src/peer_connection.cpp:511</a></td><td>it would be neat to be able to print this straight into the alert's stack allocator</td></tr><tr id="156" style="display: none;" colspan="3"><td colspan="3"><h2>it would be neat to be able to print this straight into the
-alert's stack allocator</h2><h4>../src/peer_connection.cpp:511</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(158)">../src/peer_connection.cpp:509</a></td><td>it would be neat to be able to print this straight into the alert's stack allocator</td></tr><tr id="158" style="display: none;" colspan="3"><td colspan="3"><h2>it would be neat to be able to print this straight into the
+alert's stack allocator</h2><h4>../src/peer_connection.cpp:509</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (!interested) send_not_interested();
+		else t-&gt;peer_is_interesting(*this);
+
 		TORRENT_ASSERT(in_handshake() || is_interesting() == interested);
 
 		disconnect_if_redundant();
 	}
 
 #ifndef TORRENT_DISABLE_LOGGING
-#if defined __GNUC__ || defined __clang__
-	__attribute__((format(printf, 4, 5)))
-#endif
+	TORRENT_FORMAT(4,5)
 	void peer_connection::peer_log(peer_log_alert::direction_t direction
 		, char const* event, char const* fmt, ...) const
 	{
@@ -5311,7 +5442,7 @@ alert's stack allocator</h2><h4>../src/peer_connection.cpp:511</h4><pre style="b
 		return 0;
 	}
 #endif
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(157)">../src/peer_connection.cpp:1011</a></td><td>this should be the global download rate</td></tr><tr id="157" style="display: none;" colspan="3"><td colspan="3"><h2>this should be the global download rate</h2><h4>../src/peer_connection.cpp:1011</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(159)">../src/peer_connection.cpp:1009</a></td><td>this should be the global download rate</td></tr><tr id="159" style="display: none;" colspan="3"><td colspan="3"><h2>this should be the global download rate</h2><h4>../src/peer_connection.cpp:1009</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		int rate = 0;
 
 		// if we haven't received any data recently, the current download rate
@@ -5362,7 +5493,7 @@ alert's stack allocator</h2><h4>../src/peer_connection.cpp:511</h4><pre style="b
 		if (m_ignore_stats) return;
 		boost::shared_ptr&lt;torrent&gt; t = m_torrent.lock();
 		if (!t) return;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(158)">../src/peer_connection.cpp:3284</a></td><td>sort the allowed fast set in priority order</td></tr><tr id="158" style="display: none;" colspan="3"><td colspan="3"><h2>sort the allowed fast set in priority order</h2><h4>../src/peer_connection.cpp:3284</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(160)">../src/peer_connection.cpp:3282</a></td><td>sort the allowed fast set in priority order</td></tr><tr id="160" style="display: none;" colspan="3"><td colspan="3"><h2>sort the allowed fast set in priority order</h2><h4>../src/peer_connection.cpp:3282</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// if the peer has the piece and we want
 		// to download it, request it
 		if (int(m_have_piece.size()) &gt; index
@@ -5413,8 +5544,8 @@ alert's stack allocator</h2><h4>../src/peer_connection.cpp:511</h4><pre style="b
 		boost::shared_ptr&lt;torrent&gt; t = m_torrent.lock();
 		TORRENT_ASSERT(t);
 		TORRENT_ASSERT(t-&gt;has_picker());
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(159)">../src/peer_connection.cpp:6050</a></td><td>The stats checks can not be honored when authenticated encryption is in use because we may have encrypted data which we cannot authenticate yet</td></tr><tr id="159" style="display: none;" colspan="3"><td colspan="3"><h2>The stats checks can not be honored when authenticated encryption is in use
-because we may have encrypted data which we cannot authenticate yet</h2><h4>../src/peer_connection.cpp:6050</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			peer_log(peer_log_alert::incoming, "READ"
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(161)">../src/peer_connection.cpp:6048</a></td><td>The stats checks can not be honored when authenticated encryption is in use because we may have encrypted data which we cannot authenticate yet</td></tr><tr id="161" style="display: none;" colspan="3"><td colspan="3"><h2>The stats checks can not be honored when authenticated encryption is in use
+because we may have encrypted data which we cannot authenticate yet</h2><h4>../src/peer_connection.cpp:6048</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			peer_log(peer_log_alert::incoming, "READ"
 				, "%d bytes", int(bytes_transferred));
 #endif
 			// correct the dl quota usage, if not all of the buffer was actually read
@@ -5465,7 +5596,7 @@ because we may have encrypted data which we cannot authenticate yet</h2><h4>../s
 			}
 
 			if (num_loops &gt; read_loops) break;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(160)">../src/piece_picker.cpp:2070</a></td><td>this could probably be optimized by incrementally calling partial_sort to sort one more element in the list. Because chances are that we'll just need a single piece, and once we've picked from it we're done. Sorting the rest of the list in that case is a waste of time.</td></tr><tr id="160" style="display: none;" colspan="3"><td colspan="3"><h2>this could probably be optimized by incrementally
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(162)">../src/piece_picker.cpp:2070</a></td><td>this could probably be optimized by incrementally calling partial_sort to sort one more element in the list. Because chances are that we'll just need a single piece, and once we've picked from it we're done. Sorting the rest of the list in that case is a waste of time.</td></tr><tr id="162" style="display: none;" colspan="3"><td colspan="3"><h2>this could probably be optimized by incrementally
 calling partial_sort to sort one more element in the list. Because
 chances are that we'll just need a single piece, and once we've
 picked from it we're done. Sorting the rest of the list in that
@@ -5520,7 +5651,7 @@ case is a waste of time.</h2><h4>../src/piece_picker.cpp:2070</h4><pre style="ba
 				i != suggested_pieces.end(); ++i)
 			{
 				// in time critical mode, only pick high priority pieces
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(161)">../src/piece_picker.cpp:2575</a></td><td>when expanding pieces for cache stripe reasons, the !downloading condition doesn't make much sense</td></tr><tr id="161" style="display: none;" colspan="3"><td colspan="3"><h2>when expanding pieces for cache stripe reasons,
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(163)">../src/piece_picker.cpp:2575</a></td><td>when expanding pieces for cache stripe reasons, the !downloading condition doesn't make much sense</td></tr><tr id="163" style="display: none;" colspan="3"><td colspan="3"><h2>when expanding pieces for cache stripe reasons,
 the !downloading condition doesn't make much sense</h2><h4>../src/piece_picker.cpp:2575</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		TORRENT_ASSERT(index &lt; (int)m_piece_map.size() || m_piece_map.empty());
 		if (index+1 == (int)m_piece_map.size())
 			return m_blocks_in_last_piece;
@@ -5569,7 +5700,7 @@ the !downloading condition doesn't make much sense</h2><h4>../src/piece_picker.c
 	// blocks from this piece.
 	// the second bool is true if this is the only active peer that is requesting
 	// and downloading blocks from this piece. Active means having a connection.
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(162)">../src/session_impl.cpp:504</a></td><td>there's no rule here to make uTP connections not have the global or local rate limits apply to it. This used to be the default.</td></tr><tr id="162" style="display: none;" colspan="3"><td colspan="3"><h2>there's no rule here to make uTP connections not have the global or
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(164)">../src/session_impl.cpp:504</a></td><td>there's no rule here to make uTP connections not have the global or local rate limits apply to it. This used to be the default.</td></tr><tr id="164" style="display: none;" colspan="3"><td colspan="3"><h2>there's no rule here to make uTP connections not have the global or
 local rate limits apply to it. This used to be the default.</h2><h4>../src/session_impl.cpp:504</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_global_class = m_classes.new_peer_class("global");
 		m_tcp_peer_class = m_classes.new_peer_class("tcp");
 		m_local_peer_class = m_classes.new_peer_class("local");
@@ -5621,7 +5752,7 @@ local rate limits apply to it. This used to be the default.</h2><h4>../src/sessi
 				, int(rl.rlim_cur * 8 / 10)));
 			// 20% goes towards regular files (see disk_io_thread)
 #ifndef TORRENT_DISABLE_LOGGING
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(163)">../src/session_impl.cpp:1731</a></td><td>instead of having a special case for this, just make the default listen interfaces be "0.0.0.0:6881,[::1]:6881" and use the generic path. That would even allow for not listening at all.</td></tr><tr id="163" style="display: none;" colspan="3"><td colspan="3"><h2>instead of having a special case for this, just make the
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(165)">../src/session_impl.cpp:1731</a></td><td>instead of having a special case for this, just make the default listen interfaces be "0.0.0.0:6881,[::1]:6881" and use the generic path. That would even allow for not listening at all.</td></tr><tr id="165" style="display: none;" colspan="3"><td colspan="3"><h2>instead of having a special case for this, just make the
 default listen interfaces be "0.0.0.0:6881,[::1]:6881" and use
 the generic path. That would even allow for not listening at all.</h2><h4>../src/session_impl.cpp:1731</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// reset the retry counter
@@ -5674,7 +5805,7 @@ retry:
 				if (s.sock)
 				{
 					TORRENT_ASSERT(!m_abort);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(164)">../src/session_impl.cpp:2624</a></td><td>should this function take a shared_ptr instead?</td></tr><tr id="164" style="display: none;" colspan="3"><td colspan="3"><h2>should this function take a shared_ptr instead?</h2><h4>../src/session_impl.cpp:2624</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(166)">../src/session_impl.cpp:2624</a></td><td>should this function take a shared_ptr instead?</td></tr><tr id="166" style="display: none;" colspan="3"><td colspan="3"><h2>should this function take a shared_ptr instead?</h2><h4>../src/session_impl.cpp:2624</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
 #if defined TORRENT_ASIO_DEBUGGING
 		complete_async("session_impl::on_socks_accept");
 #endif
@@ -5725,7 +5856,7 @@ retry:
 		TORRENT_ASSERT(sp.use_count() &gt; 0);
 
 		connection_map::iterator i = m_connections.find(sp);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(165)">../src/session_impl.cpp:2983</a></td><td>have a separate list for these connections, instead of having to loop through all of them</td></tr><tr id="165" 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:2983</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (m_auto_manage_time_scaler &lt; 0)
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(167)">../src/session_impl.cpp:2983</a></td><td>have a separate list for these connections, instead of having to loop through all of them</td></tr><tr id="167" 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:2983</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (m_auto_manage_time_scaler &lt; 0)
 		{
 			INVARIANT_CHECK;
 			m_auto_manage_time_scaler = settings().get_int(settings_pack::auto_manage_interval);
@@ -5774,7 +5905,7 @@ retry:
 			if (!t.want_tick()) --i;
 		}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(166)">../src/session_impl.cpp:3013</a></td><td>this should apply to all bandwidth channels</td></tr><tr id="166" style="display: none;" colspan="3"><td colspan="3"><h2>this should apply to all bandwidth channels</h2><h4>../src/session_impl.cpp:3013</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if TORRENT_DEBUG_STREAMING &gt; 0
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(168)">../src/session_impl.cpp:3013</a></td><td>this should apply to all bandwidth channels</td></tr><tr id="168" style="display: none;" colspan="3"><td colspan="3"><h2>this should apply to all bandwidth channels</h2><h4>../src/session_impl.cpp:3013</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if TORRENT_DEBUG_STREAMING &gt; 0
 		printf("\033[2J\033[0;0H");
 #endif
 
@@ -5825,7 +5956,7 @@ retry:
 		// scrape paused torrents that are auto managed
 		// (unless the session is paused)
 		// --------------------------------------------------------------
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(167)">../src/session_impl.cpp:3500</a></td><td>these vectors could be copied from m_torrent_lists, if we would maintain them. That way the first pass over all torrents could be avoided. It would be especially efficient if most torrents are not auto-managed whenever we receive a scrape response (or anything that may change the rank of a torrent) that one torrent could re-sort itself in a list that's kept sorted at all times. That way, this pass over all torrents could be avoided alltogether.</td></tr><tr id="167" style="display: none;" colspan="3"><td colspan="3"><h2>these vectors could be copied from m_torrent_lists,
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(169)">../src/session_impl.cpp:3500</a></td><td>these vectors could be copied from m_torrent_lists, if we would maintain them. That way the first pass over all torrents could be avoided. It would be especially efficient if most torrents are not auto-managed whenever we receive a scrape response (or anything that may change the rank of a torrent) that one torrent could re-sort itself in a list that's kept sorted at all times. That way, this pass over all torrents could be avoided alltogether.</td></tr><tr id="169" style="display: none;" colspan="3"><td colspan="3"><h2>these vectors could be copied from m_torrent_lists,
 if we would maintain them. That way the first pass over
 all torrents could be avoided. It would be especially
 efficient if most torrents are not auto-managed
@@ -5884,7 +6015,7 @@ avoided alltogether.</h2><h4>../src/session_impl.cpp:3500</h4><pre style="backgr
             
 		for (torrent_map::iterator i = m_torrents.begin()
 			, end(m_torrents.end()); i != end; ++i)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(168)">../src/session_impl.cpp:3577</a></td><td>allow extensions to sort torrents for queuing</td></tr><tr id="168" style="display: none;" colspan="3"><td colspan="3"><h2>allow extensions to sort torrents for queuing</h2><h4>../src/session_impl.cpp:3577</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (t-&gt;is_finished())
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(170)">../src/session_impl.cpp:3577</a></td><td>allow extensions to sort torrents for queuing</td></tr><tr id="170" style="display: none;" colspan="3"><td colspan="3"><h2>allow extensions to sort torrents for queuing</h2><h4>../src/session_impl.cpp:3577</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (t-&gt;is_finished())
 					seeds.push_back(t);
 				else
 					downloaders.push_back(t);
@@ -5935,7 +6066,7 @@ avoided alltogether.</h2><h4>../src/session_impl.cpp:3500</h4><pre style="backgr
 				, hard_limit, num_downloaders);
 			auto_manage_torrents(seeds, checking_limit, dht_limit, tracker_limit, lsd_limit
 				, hard_limit, num_seeds);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(169)">../src/session_impl.cpp:3750</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="169" 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(171)">../src/session_impl.cpp:3750</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="171" 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:3750</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// robin fashion, so that every torrent is equally likely to connect to a
 		// peer
@@ -5988,7 +6119,7 @@ connections</h2><h4>../src/session_impl.cpp:3750</h4><pre style="background: #f6
 				m_next_finished_connect_torrent = 0;
 
 			torrent* t = NULL;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(170)">../src/session_impl.cpp:3893</a></td><td>post a message to have this happen immediately instead of waiting for the next tick</td></tr><tr id="170" style="display: none;" colspan="3"><td colspan="3"><h2>post a message to have this happen
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(172)">../src/session_impl.cpp:3893</a></td><td>post a message to have this happen immediately instead of waiting for the next tick</td></tr><tr id="172" 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:3893</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			torrent* t = p-&gt;associated_torrent().lock().get();
 			torrent_peer* pi = p-&gt;peer_info_struct();
 
@@ -6040,7 +6171,7 @@ immediately instead of waiting for the next tick</h2><h4>../src/session_impl.cpp
 
 		int num_opt_unchoke = m_settings.get_int(settings_pack::num_optimistic_unchoke_slots);
 		if (num_opt_unchoke == 0) num_opt_unchoke = (std::max)(1, allowed_upload_slots / 5);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(171)">../src/session_impl.cpp:3940</a></td><td>this should be called for all peers!</td></tr><tr id="171" style="display: none;" colspan="3"><td colspan="3"><h2>this should be called for all peers!</h2><h4>../src/session_impl.cpp:3940</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			, unchoke_interval, m_settings);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(173)">../src/session_impl.cpp:3940</a></td><td>this should be called for all peers!</td></tr><tr id="173" style="display: none;" colspan="3"><td colspan="3"><h2>this should be called for all peers!</h2><h4>../src/session_impl.cpp:3940</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			, unchoke_interval, m_settings);
 		m_stats_counters.set_value(counters::num_unchoke_slots
 			, allowed_upload_slots);
 
@@ -6091,12 +6222,12 @@ immediately instead of waiting for the next tick</h2><h4>../src/session_impl.cpp
 			{
 				// no, this peer should be choked
 				TORRENT_ASSERT(p-&gt;peer_info_struct());
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(172)">../src/session_impl.cpp:4350</a></td><td>it might be a nice feature here to limit the number of torrents to send in a single update. By just posting the first n torrents, they would nicely be round-robined because the torrent lists are always pushed back. Perhaps the status_update_alert could even have a fixed array of n entries rather than a vector, to further improve memory locality.</td></tr><tr id="172" style="display: none;" colspan="3"><td colspan="3"><h2>it might be a nice feature here to limit the number of torrents
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(174)">../src/session_impl.cpp:4346</a></td><td>it might be a nice feature here to limit the number of torrents to send in a single update. By just posting the first n torrents, they would nicely be round-robined because the torrent lists are always pushed back. Perhaps the status_update_alert could even have a fixed array of n entries rather than a vector, to further improve memory locality.</td></tr><tr id="174" style="display: none;" colspan="3"><td colspan="3"><h2>it might be a nice feature here to limit the number of torrents
 to send in a single update. By just posting the first n torrents, they
 would nicely be round-robined because the torrent lists are always
 pushed back. Perhaps the status_update_alert could even have a fixed
 array of n entries rather than a vector, to further improve memory
-locality.</h2><h4>../src/session_impl.cpp:4350</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			t-&gt;status(&amp;*i, flags);
+locality.</h2><h4>../src/session_impl.cpp:4346</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			t-&gt;status(&amp;*i, flags);
 		}
 	}
 	
@@ -6147,7 +6278,7 @@ locality.</h2><h4>../src/session_impl.cpp:4350</h4><pre style="background: #f6f6
 
 		m_stats_counters.set_value(counters::recv_ip_overhead_bytes
 			, m_stat.total_transfer(stat::download_ip_protocol));
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(173)">../src/storage.cpp:731</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="173" 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(175)">../src/storage.cpp:731</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="175" 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:731</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (file_offset &lt; files().file_size(file_index))
 				break;
@@ -6200,7 +6331,7 @@ maybe use the same format as .torrent files and reuse some code from torrent_inf
 		}
 		
 		if (file_sizes_ent.list_size() == 0)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(174)">../src/storage.cpp:1062</a></td><td>if everything moves OK, except for the partfile we currently won't update the save path, which breaks things. it would probably make more sense to give up on the partfile</td></tr><tr id="174" style="display: none;" colspan="3"><td colspan="3"><h2>if everything moves OK, except for the partfile
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(176)">../src/storage.cpp:1062</a></td><td>if everything moves OK, except for the partfile we currently won't update the save path, which breaks things. it would probably make more sense to give up on the partfile</td></tr><tr id="176" style="display: none;" colspan="3"><td colspan="3"><h2>if everything moves OK, except for the partfile
 we currently won't update the save path, which breaks things.
 it would probably make more sense to give up on the partfile</h2><h4>../src/storage.cpp:1062</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					if (ec)
 					{
@@ -6253,7 +6384,7 @@ it would probably make more sense to give up on the partfile</h2><h4>../src/stor
 	{
 		fileop op = { &amp;file::writev
 			, file::read_write | flags };
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(175)">../src/string_util.cpp:60</a></td><td>warning C4146: unary minus operator applied to unsigned type, result still unsigned</td></tr><tr id="175" style="display: none;" colspan="3"><td colspan="3"><h2>warning C4146: unary minus operator applied to unsigned type,
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(177)">../src/string_util.cpp:60</a></td><td>warning C4146: unary minus operator applied to unsigned type, result still unsigned</td></tr><tr id="177" style="display: none;" colspan="3"><td colspan="3"><h2>warning C4146: unary minus operator applied to unsigned type,
 result still unsigned</h2><h4>../src/string_util.cpp:60</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 #include &lt;boost/tuple/tuple.hpp&gt;
 
@@ -6305,7 +6436,7 @@ namespace libtorrent
 		return (c &gt;= 'A' &amp;&amp; c &lt;= 'Z') ? c - 'A' + 'a' : c;
 	}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(176)">../src/torrent.cpp:515</a></td><td>if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it.</td></tr><tr id="176" style="display: none;" colspan="3"><td colspan="3"><h2>if the existing torrent doesn't have metadata, insert
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(178)">../src/torrent.cpp:515</a></td><td>if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it.</td></tr><tr id="178" style="display: none;" colspan="3"><td colspan="3"><h2>if the existing torrent doesn't have metadata, insert
 the metadata we just downloaded into it.</h2><h4>../src/torrent.cpp:515</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		m_torrent_file = tf;
 
@@ -6357,7 +6488,7 @@ the metadata we just downloaded into it.</h2><h4>../src/torrent.cpp:515</h4><pre
 		hasher h;
 		h.update("req2", 4);
 		h.update((char*)&amp;m_torrent_file-&gt;info_hash()[0], 20);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(177)">../src/torrent.cpp:666</a></td><td>if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it.</td></tr><tr id="177" style="display: none;" colspan="3"><td colspan="3"><h2>if the existing torrent doesn't have metadata, insert
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(179)">../src/torrent.cpp:666</a></td><td>if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it.</td></tr><tr id="179" style="display: none;" colspan="3"><td colspan="3"><h2>if the existing torrent doesn't have metadata, insert
 the metadata we just downloaded into it.</h2><h4>../src/torrent.cpp:666</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_torrent_file = tf;
 		m_info_hash = tf-&gt;info_hash();
 
@@ -6409,7 +6540,7 @@ the metadata we just downloaded into it.</h2><h4>../src/torrent.cpp:666</h4><pre
 		h.update((char*)&amp;m_torrent_file-&gt;info_hash()[0], 20);
 		m_ses.add_obfuscated_hash(h.final(), shared_from_this());
 #endif
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(178)">../src/torrent.cpp:1475</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="178" 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(180)">../src/torrent.cpp:1475</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="180" 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)
@@ -6465,7 +6596,7 @@ need to be verified to make sure its DN matches the info-hash</h2><h4>../src/tor
 			{
 #ifndef TORRENT_DISABLE_LOGGING
 				match = true;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(179)">../src/torrent.cpp:1882</a></td><td>instead of creating the picker up front here, maybe this whole section should move to need_picker()</td></tr><tr id="179" style="display: none;" colspan="3"><td colspan="3"><h2>instead of creating the picker up front here,
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(181)">../src/torrent.cpp:1882</a></td><td>instead of creating the picker up front here, maybe this whole section should move to need_picker()</td></tr><tr id="181" style="display: none;" colspan="3"><td colspan="3"><h2>instead of creating the picker up front here,
 maybe this whole section should move to need_picker()</h2><h4>../src/torrent.cpp:1882</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		if (m_seed_mode)
 		{
@@ -6517,7 +6648,7 @@ maybe this whole section should move to need_picker()</h2><h4>../src/torrent.cpp
 			// need to consider it finished
 
 			std::vector&lt;piece_picker::downloading_piece&gt; dq
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(180)">../src/torrent.cpp:1957</a></td><td>this could be optimized by looking up which files are complete and just look at those</td></tr><tr id="180" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized by looking up which files are
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(182)">../src/torrent.cpp:1957</a></td><td>this could be optimized by looking up which files are complete and just look at those</td></tr><tr id="182" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized by looking up which files are
 complete and just look at those</h2><h4>../src/torrent.cpp:1957</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (!need_loaded()) return;
 
 		if (num_pad_files &gt; 0)
@@ -6552,7 +6683,7 @@ complete and just look at those</h2><h4>../src/torrent.cpp:1957</h4><pre style="
 					, end(ts.end()); k != end; ++k)
 				{
 					// Only attempt to reuse files from torrents that are seeding.
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(181)">../src/torrent.cpp:1973</a></td><td>this could be optimized by looking up which files are complete and just look at those</td></tr><tr id="181" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized by looking up which files are
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(183)">../src/torrent.cpp:1973</a></td><td>this could be optimized by looking up which files are complete and just look at those</td></tr><tr id="183" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized by looking up which files are
 complete and just look at those</h2><h4>../src/torrent.cpp:1973</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				i != end; ++i)
 			{
 				boost::shared_ptr&lt;torrent&gt; t = m_ses.find_torrent(*i).lock();
@@ -6604,7 +6735,7 @@ complete and just look at those</h2><h4>../src/torrent.cpp:1973</h4><pre style="
 			, links, boost::bind(&amp;torrent::on_resume_data_checked
 			, shared_from_this(), _1));
 #ifndef TORRENT_DISABLE_LOGGING
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(182)">../src/torrent.cpp:2140</a></td><td>there may be peer extensions relying on the torrent extension still being alive. Only do this if there are no peers. And when the last peer is disconnected, if the torrent is unloaded, clear the extensions m_extensions.clear();</td></tr><tr id="182" style="display: none;" colspan="3"><td colspan="3"><h2>there may be peer extensions relying on the torrent extension
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(184)">../src/torrent.cpp:2140</a></td><td>there may be peer extensions relying on the torrent extension still being alive. Only do this if there are no peers. And when the last peer is disconnected, if the torrent is unloaded, clear the extensions m_extensions.clear();</td></tr><tr id="184" style="display: none;" colspan="3"><td colspan="3"><h2>there may be peer extensions relying on the torrent extension
 still being alive. Only do this if there are no peers. And when the last peer
 is disconnected, if the torrent is unloaded, clear the extensions
 m_extensions.clear();</h2><h4>../src/torrent.cpp:2140</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// pinned torrents are not allowed to be swapped out
@@ -6658,7 +6789,7 @@ m_extensions.clear();</h2><h4>../src/torrent.cpp:2140</h4><pre style="background
 			if (was_introduced_by(pp, ep)) return (bt_peer_connection*)p;
 		}
 #endif
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(183)">../src/torrent.cpp:2816</a></td><td>this pattern is repeated in a few places. Factor this into a function and generalize the concept of a torrent having a dedicated listen port</td></tr><tr id="183" style="display: none;" colspan="3"><td colspan="3"><h2>this pattern is repeated in a few places. Factor this into
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(185)">../src/torrent.cpp:2816</a></td><td>this pattern is repeated in a few places. Factor this into a function and generalize the concept of a torrent having a dedicated listen port</td></tr><tr id="185" style="display: none;" colspan="3"><td colspan="3"><h2>this pattern is repeated in a few places. Factor this into
 a function and generalize the concept of a torrent having a
 dedicated listen port</h2><h4>../src/torrent.cpp:2816</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// if the files haven't been checked yet, we're
 		// not ready for peers. Except, if we don't have metadata,
@@ -6711,7 +6842,7 @@ dedicated listen port</h2><h4>../src/torrent.cpp:2816</h4><pre style="background
 				debug_log("DHT: no listen sockets");
 
 			if (m_torrent_file-&gt;is_valid() &amp;&amp; !m_files_checked)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(184)">../src/torrent.cpp:3593</a></td><td>add one peer per IP the hostname resolves to</td></tr><tr id="184" style="display: none;" colspan="3"><td colspan="3"><h2>add one peer per IP the hostname resolves to</h2><h4>../src/torrent.cpp:3593</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#endif
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(186)">../src/torrent.cpp:3593</a></td><td>add one peer per IP the hostname resolves to</td></tr><tr id="186" style="display: none;" colspan="3"><td colspan="3"><h2>add one peer per IP the hostname resolves to</h2><h4>../src/torrent.cpp:3593</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#endif
 
 	void torrent::on_peer_name_lookup(error_code const&amp; e
 		, std::vector&lt;address&gt; const&amp; host_list, int port)
@@ -6762,7 +6893,7 @@ dedicated listen port</h2><h4>../src/torrent.cpp:2816</h4><pre style="background
 
 	boost::int64_t torrent::quantized_bytes_done() const
 	{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(185)">../src/torrent.cpp:4587</a></td><td>update suggest_piece?</td></tr><tr id="185" style="display: none;" colspan="3"><td colspan="3"><h2>update suggest_piece?</h2><h4>../src/torrent.cpp:4587</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(187)">../src/torrent.cpp:4587</a></td><td>update suggest_piece?</td></tr><tr id="187" style="display: none;" colspan="3"><td colspan="3"><h2>update suggest_piece?</h2><h4>../src/torrent.cpp:4587</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 	void torrent::peer_has_all(peer_connection const* peer)
 	{
 		if (has_picker())
@@ -6813,7 +6944,7 @@ dedicated listen port</h2><h4>../src/torrent.cpp:2816</h4><pre style="background
 		// the suggest piece feature
 		if (!has_picker()) return;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(186)">../src/torrent.cpp:4730</a></td><td>really, we should just keep the picker around in this case to maintain the availability counters</td></tr><tr id="186" style="display: none;" colspan="3"><td colspan="3"><h2>really, we should just keep the picker around
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(188)">../src/torrent.cpp:4730</a></td><td>really, we should just keep the picker around in this case to maintain the availability counters</td></tr><tr id="188" style="display: none;" colspan="3"><td colspan="3"><h2>really, we should just keep the picker around
 in this case to maintain the availability counters</h2><h4>../src/torrent.cpp:4730</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		pieces.reserve(cs.pieces.size());
 
 		// sort in ascending order, to get most recently used first
@@ -6865,7 +6996,7 @@ in this case to maintain the availability counters</h2><h4>../src/torrent.cpp:47
 	}
 
 	void torrent::abort()
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(187)">../src/torrent.cpp:6704</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="187" 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(189)">../src/torrent.cpp:6704</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="189" 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
@@ -6921,7 +7052,7 @@ which are kept in sync</h2><h4>../src/torrent.cpp:6704</h4><pre style="backgroun
 				int end_range = num_files - 1;
 				for (; end_range &gt;= 0; --end_range) if (m_file_priority[end_range] != 1) break;
 				m_file_priority.resize(end_range + 1);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(188)">../src/torrent.cpp:6822</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="188" 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(190)">../src/torrent.cpp:6822</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="190" 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
@@ -6977,7 +7108,7 @@ no one uses merkle torrents</h2><h4>../src/torrent.cpp:6822</h4><pre style="back
 		ret["active_time"] = active_time();
 		ret["finished_time"] = finished_time();
 		ret["seeding_time"] = seeding_time();
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(189)">../src/torrent.cpp:7013</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="189" 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(191)">../src/torrent.cpp:7013</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="191" 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:7013</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		pieces.resize(m_torrent_file-&gt;num_pieces());
 		if (!has_picker())
@@ -7030,7 +7161,7 @@ using file_base</h2><h4>../src/torrent.cpp:7013</h4><pre style="background: #f6f
 			{
 				error_code ec;
 				torrent_peer const* p = *i;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(190)">../src/torrent.cpp:9028</a></td><td>add a flag to ignore stats, and only care about resume data for content. For unchanged files, don't trigger a load of the metadata just to save an empty resume data file</td></tr><tr id="190" style="display: none;" colspan="3"><td colspan="3"><h2>add a flag to ignore stats, and only care about resume data for
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(192)">../src/torrent.cpp:9028</a></td><td>add a flag to ignore stats, and only care about resume data for content. For unchanged files, don't trigger a load of the metadata just to save an empty resume data file</td></tr><tr id="192" style="display: none;" colspan="3"><td colspan="3"><h2>add a flag to ignore stats, and only care about resume data for
 content. For unchanged files, don't trigger a load of the metadata
 just to save an empty resume data file</h2><h4>../src/torrent.cpp:9028</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (m_complete != 0xffffff) seeds = m_complete;
 		else seeds = m_peer_list ? m_peer_list-&gt;num_seeds() : 0;
@@ -7083,8 +7214,8 @@ just to save an empty resume data file</h2><h4>../src/torrent.cpp:9028</h4><pre
 		m_save_resume_flags = boost::uint8_t(flags);
 		state_updated();
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(191)">../src/torrent.cpp:10641</a></td><td>instead of resorting the whole list, insert the peers directly into the right place</td></tr><tr id="191" 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:10641</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(193)">../src/torrent.cpp:10640</a></td><td>instead of resorting the whole list, insert the peers directly into the right place</td></tr><tr id="193" 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:10640</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				printf("timed out [average-piece-time: %d ms ]\n"
 					, m_average_piece_time);
 #endif
 			}
@@ -7135,7 +7266,7 @@ directly into the right place</h2><h4>../src/torrent.cpp:10641</h4><pre style="b
 			ret.insert(i-&gt;url);
 		}
 		return ret;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(192)">../src/torrent_peer.cpp:179</a></td><td>how do we deal with our external address changing?</td></tr><tr id="192" style="display: none;" colspan="3"><td colspan="3"><h2>how do we deal with our external address changing?</h2><h4>../src/torrent_peer.cpp:179</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		, is_v6_addr(false)
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(194)">../src/torrent_peer.cpp:179</a></td><td>how do we deal with our external address changing?</td></tr><tr id="194" style="display: none;" colspan="3"><td colspan="3"><h2>how do we deal with our external address changing?</h2><h4>../src/torrent_peer.cpp:179</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		, is_v6_addr(false)
 #endif
 #if TORRENT_USE_I2P
 		, is_i2p_addr(false)
@@ -7186,7 +7317,7 @@ directly into the right place</h2><h4>../src/torrent.cpp:10641</h4><pre style="b
 		{
 			return boost::uint64_t(prev_amount_upload) &lt;&lt; 10;
 		}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(193)">../src/udp_socket.cpp:288</a></td><td>it would be nice to detect this on posix systems also</td></tr><tr id="193" 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:288</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(195)">../src/udp_socket.cpp:288</a></td><td>it would be nice to detect this on posix systems also</td></tr><tr id="195" 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:288</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		--m_v6_outstanding;
 	}
 	else
 #endif
@@ -7237,7 +7368,7 @@ void udp_socket::call_handler(error_code const&amp; ec, udp::endpoint const&amp;
 			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(194)">../src/udp_socket.cpp:779</a></td><td>use the system resolver_interface here</td></tr><tr id="194" style="display: none;" colspan="3"><td colspan="3"><h2>use the system resolver_interface here</h2><h4>../src/udp_socket.cpp:779</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(196)">../src/udp_socket.cpp:779</a></td><td>use the system resolver_interface here</td></tr><tr id="196" style="display: none;" colspan="3"><td colspan="3"><h2>use the system resolver_interface here</h2><h4>../src/udp_socket.cpp:779</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 void udp_socket::set_proxy_settings(proxy_settings const&amp; ps)
 {
 	CHECK_MAGIC;
@@ -7288,7 +7419,7 @@ void udp_socket::on_name_lookup(error_code const&amp; e, tcp::resolver::iterator
 		+ m_outstanding_socks);
 
 	if (m_abort) return;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(195)">../src/ut_metadata.cpp:313</a></td><td>we really need to increment the refcounter on the torrent while this buffer is still in the peer's send buffer</td></tr><tr id="195" style="display: none;" colspan="3"><td colspan="3"><h2>we really need to increment the refcounter on the torrent
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(197)">../src/ut_metadata.cpp:313</a></td><td>we really need to increment the refcounter on the torrent while this buffer is still in the peer's send buffer</td></tr><tr id="197" style="display: none;" colspan="3"><td colspan="3"><h2>we really need to increment the refcounter on the torrent
 while this buffer is still in the peer's send buffer</h2><h4>../src/ut_metadata.cpp:313</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (!m_tp.need_loaded()) return;
 				metadata = m_tp.metadata().begin + offset;
 				metadata_piece_size = (std::min)(
@@ -7340,7 +7471,7 @@ while this buffer is still in the peer's send buffer</h2><h4>../src/ut_metadata.
 			{
 #ifndef TORRENT_DISABLE_LOGGING
 				m_pc.peer_log(peer_log_alert::incoming_message, "UT_METADATA"
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(196)">../src/utp_stream.cpp:1709</a></td><td>this loop is not very efficient. It could be fixed by having a separate list of sequence numbers that need resending</td></tr><tr id="196" style="display: none;" colspan="3"><td colspan="3"><h2>this loop is not very efficient. It could be fixed by having
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(198)">../src/utp_stream.cpp:1709</a></td><td>this loop is not very efficient. It could be fixed by having a separate list of sequence numbers that need resending</td></tr><tr id="198" style="display: none;" colspan="3"><td colspan="3"><h2>this loop is not very efficient. It could be fixed by having
 a separate list of sequence numbers that need resending</h2><h4>../src/utp_stream.cpp:1709</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 	char* m_buf;
 };
@@ -7392,7 +7523,7 @@ bool utp_socket_impl::send_pkt(int flags)
 		if (sack &gt; 32) sack = 32;
 	}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(197)">../src/web_connection_base.cpp:73</a></td><td>introduce a web-seed default class which has a low download priority</td></tr><tr id="197" style="display: none;" colspan="3"><td colspan="3"><h2>introduce a web-seed default class which has a low download priority</h2><h4>../src/web_connection_base.cpp:73</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(199)">../src/web_connection_base.cpp:73</a></td><td>introduce a web-seed default class which has a low download priority</td></tr><tr id="199" style="display: none;" colspan="3"><td colspan="3"><h2>introduce a web-seed default class which has a low download priority</h2><h4>../src/web_connection_base.cpp:73</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">{
 	web_connection_base::web_connection_base(
 		peer_connection_args const&amp; pack
 		, web_seed_t&amp; web)
@@ -7443,7 +7574,7 @@ bool utp_socket_impl::send_pkt(int flags)
 		// according to the settings.
 		return m_settings.get_int(settings_pack::urlseed_timeout);
 	}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(198)">../src/kademlia/dht_tracker.cpp:307</a></td><td>ideally this function would be called when the put completes</td></tr><tr id="198" 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(200)">../src/kademlia/dht_tracker.cpp:307</a></td><td>ideally this function would be called when the put completes</td></tr><tr id="200" 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:307</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);
@@ -7495,58 +7626,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:307</h4><pre style="backgr
 		, boost::function&lt;void()&gt; cb)
 	{
 		std::string flat_data;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(199)">../include/libtorrent/bitfield.hpp:160</a></td><td>rename to data() ?</td></tr><tr id="199" style="display: none;" colspan="3"><td colspan="3"><h2>rename to data() ?</h2><h4>../include/libtorrent/bitfield.hpp:160</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (m_buf[i] != 0) return false;
-			}
-			return true;
-		}
-
-		// returns the size of the bitfield in bits.
-		int size() const
-		{
-			return m_buf == NULL ? 0 : int(m_buf[-1]);
-		}
-
-		int num_words() const
-		{
-			return (size() + 31) / 32;
-		}
-
-		// returns true if the bitfield has zero size.
-		bool empty() const { return m_buf == NULL ? true : m_buf[-1] == 0; }
-
-		// returns a pointer to the internal buffer of the bitfield.
-<div style="background: #ffff00" width="100%">		char const* bytes() const { return reinterpret_cast&lt;char const*&gt;(m_buf); }
-</div>
-		// copy operator
-		bitfield&amp; operator=(bitfield const&amp; rhs)
-		{
-			assign(rhs.bytes(), rhs.size());
-			return *this;
-		}
-
-		// count the number of bits in the bitfield that are set to 1.
-		int count() const
-		{
-			int ret = 0;
-			const int words = num_words();
-#if TORRENT_HAS_SSE
-			if (aux::mmx_support)
-			{
-				for (int i = 0; i &lt; words; ++i)
-				{
-#ifdef __GNUC__
-					ret += __builtin_popcount(m_buf[i]);
-#else
-					ret += _mm_popcnt_u32(m_buf[i]);
-#endif
-				}
-
-				return ret;
-			}	
-#endif // TORRENT_HAS_SSE
-
-			for (int i = 0; i &lt; words; ++i)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(200)">../include/libtorrent/block_cache.hpp:219</a></td><td>make this 32 bits and to count seconds since the block cache was created</td></tr><tr id="200" style="display: none;" colspan="3"><td colspan="3"><h2>make this 32 bits and to count seconds since the block cache was created</h2><h4>../include/libtorrent/block_cache.hpp:219</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(201)">../include/libtorrent/block_cache.hpp:219</a></td><td>make this 32 bits and to count seconds since the block cache was created</td></tr><tr id="201" style="display: none;" colspan="3"><td colspan="3"><h2>make this 32 bits and to count seconds since the block cache was created</h2><h4>../include/libtorrent/block_cache.hpp:219</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		bool operator==(cached_piece_entry const&amp; rhs) const
 		{ return storage.get() == rhs.storage.get() &amp;&amp; piece == rhs.piece; }
 
@@ -7597,7 +7677,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:307</h4><pre style="backgr
 
 		// this is set to true once we flush blocks past
 		// the hash cursor. Once this happens, there's
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(201)">../include/libtorrent/config.hpp:339</a></td><td>Make this count Unicode characters instead of bytes on windows</td></tr><tr id="201" 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:339</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#pragma message ( "unknown OS, assuming BSD" )
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(202)">../include/libtorrent/config.hpp:339</a></td><td>Make this count Unicode characters instead of bytes on windows</td></tr><tr id="202" 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:339</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#pragma message ( "unknown OS, assuming BSD" )
 #else
 #warning "unknown OS, assuming BSD"
 #endif
@@ -7648,7 +7728,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:307</h4><pre style="backgr
 
 #endif
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(202)">../include/libtorrent/disk_buffer_pool.hpp:137</a></td><td>try to remove the observers, only using the async_allocate handlers</td></tr><tr id="202" style="display: none;" colspan="3"><td colspan="3"><h2>try to remove the observers, only using the async_allocate handlers</h2><h4>../include/libtorrent/disk_buffer_pool.hpp:137</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(203)">../include/libtorrent/disk_buffer_pool.hpp:137</a></td><td>try to remove the observers, only using the async_allocate handlers</td></tr><tr id="203" style="display: none;" colspan="3"><td colspan="3"><h2>try to remove the observers, only using the async_allocate handlers</h2><h4>../include/libtorrent/disk_buffer_pool.hpp:137</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// number of bytes per block. The BitTorrent
 		// protocol defines the block size to 16 KiB.
 		const int m_block_size;
@@ -7699,7 +7779,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:307</h4><pre style="backgr
 		// the pointer to the block of virtual address space
 		// making up the mmapped cache space
 		char* m_cache_pool;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(203)">../include/libtorrent/file.hpp:173</a></td><td>move this into a separate header file, TU pair</td></tr><tr id="203" style="display: none;" colspan="3"><td colspan="3"><h2>move this into a separate header file, TU pair</h2><h4>../include/libtorrent/file.hpp:173</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TORRENT_EXTRA_EXPORT std::string parent_path(std::string const&amp; f);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(204)">../include/libtorrent/file.hpp:173</a></td><td>move this into a separate header file, TU pair</td></tr><tr id="204" style="display: none;" colspan="3"><td colspan="3"><h2>move this into a separate header file, TU pair</h2><h4>../include/libtorrent/file.hpp:173</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TORRENT_EXTRA_EXPORT std::string parent_path(std::string const&amp; f);
 	TORRENT_EXTRA_EXPORT bool has_parent_path(std::string const&amp; f);
 	TORRENT_EXTRA_EXPORT char const* filename_cstr(char const* f);
 
@@ -7750,7 +7830,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:307</h4><pre style="backgr
 
 	struct file;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(204)">../include/libtorrent/heterogeneous_queue.hpp:185</a></td><td>if this throws, should we do anything?</td></tr><tr id="204" style="display: none;" colspan="3"><td colspan="3"><h2>if this throws, should we do anything?</h2><h4>../include/libtorrent/heterogeneous_queue.hpp:185</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			- 1) / sizeof(uintptr_t);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(205)">../include/libtorrent/heterogeneous_queue.hpp:185</a></td><td>if this throws, should we do anything?</td></tr><tr id="205" style="display: none;" colspan="3"><td colspan="3"><h2>if this throws, should we do anything?</h2><h4>../include/libtorrent/heterogeneous_queue.hpp:185</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			- 1) / sizeof(uintptr_t);
 
 		void grow_capacity(int size)
 		{
@@ -7801,7 +7881,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:307</h4><pre style="backgr
 		int m_num_items;
 	};
 }
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(205)">../include/libtorrent/peer_connection.hpp:204</a></td><td>make this a raw pointer (to save size in the first cache line) and make the constructor take a raw pointer. torrent objects should always outlive their peers</td></tr><tr id="205" style="display: none;" colspan="3"><td colspan="3"><h2>make this a raw pointer (to save size in
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(206)">../include/libtorrent/peer_connection.hpp:204</a></td><td>make this a raw pointer (to save size in the first cache line) and make the constructor take a raw pointer. torrent objects should always outlive their peers</td></tr><tr id="206" style="display: none;" colspan="3"><td colspan="3"><h2>make this a raw pointer (to save size in
 the first cache line) and make the constructor
 take a raw pointer. torrent objects should always
 outlive their peers</h2><h4>../include/libtorrent/peer_connection.hpp:204</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			, m_connecting(!t.expired())
@@ -7855,8 +7935,8 @@ outlive their peers</h2><h4>../include/libtorrent/peer_connection.hpp:204</h4><p
 		// pick a piece to download, we could only find
 		// blocks that were already requested from other
 		// peers. In this case, we should not try to pick
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(206)">../include/libtorrent/peer_connection.hpp:1047</a></td><td>factor this out into its own class with a virtual interface torrent and session should implement this interface</td></tr><tr id="206" style="display: none;" colspan="3"><td colspan="3"><h2>factor this out into its own class with a virtual interface
-torrent and session should implement this interface</h2><h4>../include/libtorrent/peer_connection.hpp:1047</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(207)">../include/libtorrent/peer_connection.hpp:1043</a></td><td>factor this out into its own class with a virtual interface torrent and session should implement this interface</td></tr><tr id="207" style="display: none;" colspan="3"><td colspan="3"><h2>factor this out into its own class with a virtual interface
+torrent and session should implement this interface</h2><h4>../include/libtorrent/peer_connection.hpp:1043</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// the local endpoint for this peer, i.e. our address
 		// and our port. If this is set for outgoing connections
 		// before the connection completes, it means we want to
@@ -7907,7 +7987,7 @@ torrent and session should implement this interface</h2><h4>../include/libtorren
 		// we have got from this peer. If the request
 		// queue gets empty, and there have been
 		// invalid requests, we can assume the
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(207)">../include/libtorrent/peer_connection_interface.hpp:47</a></td><td>make this interface smaller!</td></tr><tr id="207" style="display: none;" colspan="3"><td colspan="3"><h2>make this interface smaller!</h2><h4>../include/libtorrent/peer_connection_interface.hpp:47</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(208)">../include/libtorrent/peer_connection_interface.hpp:47</a></td><td>make this interface smaller!</td></tr><tr id="208" style="display: none;" colspan="3"><td colspan="3"><h2>make this interface smaller!</h2><h4>../include/libtorrent/peer_connection_interface.hpp:47</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">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.
 
@@ -7946,11 +8026,7 @@ namespace libtorrent
 		virtual void get_peer_info(peer_info&amp; p) const = 0;
 #ifndef TORRENT_DISABLE_LOGGING
 		virtual void peer_log(peer_log_alert::direction_t direction
-			, char const* event, char const* fmt = "", ...) const
-#if defined __GNUC__ || defined __clang__
-			__attribute__((format(printf, 4, 5)))
-#endif
-			= 0;
+			, char const* event, char const* fmt = "", ...) const TORRENT_FORMAT(4,5) = 0;
 #endif
 	protected:
 		~peer_connection_interface() {}
@@ -7958,7 +8034,8 @@ namespace libtorrent
 }
 
 #endif
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(208)">../include/libtorrent/performance_counters.hpp:139</a></td><td>should keepalives be in here too? how about dont-have, share-mode, upload-only</td></tr><tr id="208" style="display: none;" colspan="3"><td colspan="3"><h2>should keepalives be in here too?
+
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(209)">../include/libtorrent/performance_counters.hpp:139</a></td><td>should keepalives be in here too? how about dont-have, share-mode, upload-only</td></tr><tr id="209" style="display: none;" colspan="3"><td colspan="3"><h2>should keepalives be in here too?
 how about dont-have, share-mode, upload-only</h2><h4>../include/libtorrent/performance_counters.hpp:139</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// a connect candidate
 			connection_attempt_loops,
 			// successful incoming connections (not rejected for any reason)
@@ -8010,12 +8087,12 @@ how about dont-have, share-mode, upload-only</h2><h4>../include/libtorrent/perfo
 			num_outgoing_cancel,
 			num_outgoing_dht_port,
 			num_outgoing_suggest,
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(209)">../include/libtorrent/performance_counters.hpp:449</a></td><td>some space could be saved here by making gauges 32 bits</td></tr><tr id="209" style="display: none;" colspan="3"><td colspan="3"><h2>some space could be saved here by making gauges 32 bits</h2><h4>../include/libtorrent/performance_counters.hpp:449</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(210)">../include/libtorrent/performance_counters.hpp:450</a></td><td>restore these to regular integers. Instead have one copy of the counters per thread and collect them at convenient synchronization points</td></tr><tr id="210" style="display: none;" colspan="3"><td colspan="3"><h2>restore these to regular integers. Instead have one copy
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(210)">../include/libtorrent/performance_counters.hpp:451</a></td><td>some space could be saved here by making gauges 32 bits</td></tr><tr id="210" style="display: none;" colspan="3"><td colspan="3"><h2>some space could be saved here by making gauges 32 bits</h2><h4>../include/libtorrent/performance_counters.hpp:451</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(211)">../include/libtorrent/performance_counters.hpp:452</a></td><td>restore these to regular integers. Instead have one copy of the counters per thread and collect them at convenient synchronization points</td></tr><tr id="211" style="display: none;" colspan="3"><td colspan="3"><h2>restore these to regular integers. Instead have one copy
 of the counters per thread and collect them at convenient
-synchronization points</h2><h4>../include/libtorrent/performance_counters.hpp:450</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			num_utp_deleted,
+synchronization points</h2><h4>../include/libtorrent/performance_counters.hpp:452</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			num_utp_deleted,
 
 			num_counters,
-			num_gauge_counters = num_counters - num_stats_counters
+			num_gauges_counters = num_counters - num_stats_counters
 		};
 
 		counters();
@@ -8045,7 +8122,7 @@ synchronization points</h2><h4>../include/libtorrent/performance_counters.hpp:45
 
 #endif
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(211)">../include/libtorrent/piece_picker.hpp:762</a></td><td>should this be allocated lazily?</td></tr><tr id="211" style="display: none;" colspan="3"><td colspan="3"><h2>should this be allocated lazily?</h2><h4>../include/libtorrent/piece_picker.hpp:762</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(212)">../include/libtorrent/piece_picker.hpp:762</a></td><td>should this be allocated lazily?</td></tr><tr id="212" style="display: none;" colspan="3"><td colspan="3"><h2>should this be allocated lazily?</h2><h4>../include/libtorrent/piece_picker.hpp:762</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		std::vector&lt;downloading_piece&gt;::const_iterator find_dl_piece(int queue, int index) const;
 		std::vector&lt;downloading_piece&gt;::iterator find_dl_piece(int queue, int index);
 
@@ -8096,7 +8173,7 @@ synchronization points</h2><h4>../include/libtorrent/performance_counters.hpp:45
 
 		// this holds the information of the blocks in partially downloaded
 		// pieces. the downloading_piece::info index point into this vector for
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(212)">../include/libtorrent/proxy_base.hpp:173</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="212" 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(213)">../include/libtorrent/proxy_base.hpp:173</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="213" 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:173</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	void bind(endpoint_type const&amp; /* endpoint */)
 	{
 //		m_sock.bind(endpoint);
@@ -8148,7 +8225,7 @@ m_sock.bind(endpoint, ec);</h2><h4>../include/libtorrent/proxy_base.hpp:173</h4>
 		m_sock.close(ec);
 		m_resolver.cancel();
 	}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(213)">../include/libtorrent/receive_buffer.hpp:258</a></td><td>Detect when the start of the next crpyto packet is aligned with the start of piece data and the crpyto packet is at least as large as the piece data. With a little extra work we could receive directly into a disk buffer in that case.</td></tr><tr id="213" style="display: none;" colspan="3"><td colspan="3"><h2>Detect when the start of the next crpyto packet is aligned
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(214)">../include/libtorrent/receive_buffer.hpp:258</a></td><td>Detect when the start of the next crpyto packet is aligned with the start of piece data and the crpyto packet is at least as large as the piece data. With a little extra work we could receive directly into a disk buffer in that case.</td></tr><tr id="214" style="display: none;" colspan="3"><td colspan="3"><h2>Detect when the start of the next crpyto packet is aligned
 with the start of piece data and the crpyto packet is at least
 as large as the piece data. With a little extra work
 we could receive directly into a disk buffer in that case.</h2><h4>../include/libtorrent/receive_buffer.hpp:258</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
@@ -8191,7 +8268,7 @@ private:
 } // namespace libtorrent
 
 #endif // #ifndef TORRENT_RECEIVE_BUFFER_HPP_INCLUDED
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(214)">../include/libtorrent/session.hpp:844</a></td><td>add get_peer_class_type_filter() as well</td></tr><tr id="214" style="display: none;" colspan="3"><td colspan="3"><h2>add get_peer_class_type_filter() as well</h2><h4>../include/libtorrent/session.hpp:844</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(215)">../include/libtorrent/session.hpp:844</a></td><td>add get_peer_class_type_filter() as well</td></tr><tr id="215" style="display: none;" colspan="3"><td colspan="3"><h2>add get_peer_class_type_filter() as well</h2><h4>../include/libtorrent/session.hpp:844</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// 
 		// The ``peer_class`` argument cannot be greater than 31. The bitmasks
 		// representing peer classes in the ``peer_class_filter`` are 32 bits.
 		// 
@@ -8242,7 +8319,7 @@ private:
 		// destructs.
 		// 
 		// For more information on peer classes, see peer-classes_.
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(215)">../include/libtorrent/settings_pack.hpp:1097</a></td><td>deprecate this ``max_rejects`` is the number of piece requests we will reject in a row while a peer is choked before the peer is considered abusive and is disconnected.</td></tr><tr id="215" style="display: none;" colspan="3"><td colspan="3"><h2>deprecate this
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(216)">../include/libtorrent/settings_pack.hpp:1097</a></td><td>deprecate this ``max_rejects`` is the number of piece requests we will reject in a row while a peer is choked before the peer is considered abusive and is disconnected.</td></tr><tr id="216" style="display: none;" colspan="3"><td colspan="3"><h2>deprecate this
 ``max_rejects`` is the number of piece requests we will reject in a
 row while a peer is choked before the peer is considered abusive
 and is disconnected.</h2><h4>../include/libtorrent/settings_pack.hpp:1097</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			auto_manage_startup,
@@ -8296,7 +8373,7 @@ and is disconnected.</h2><h4>../include/libtorrent/settings_pack.hpp:1097</h4><p
 			read_cache_line_size,
 			write_cache_line_size,
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(216)">../include/libtorrent/torrent.hpp:1267</a></td><td>this wastes 5 bits per file</td></tr><tr id="216" style="display: none;" colspan="3"><td colspan="3"><h2>this wastes 5 bits per file</h2><h4>../include/libtorrent/torrent.hpp:1267</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		typedef std::list&lt;boost::shared_ptr&lt;torrent_plugin&gt; &gt; extension_list_t;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(217)">../include/libtorrent/torrent.hpp:1263</a></td><td>this wastes 5 bits per file</td></tr><tr id="217" style="display: none;" colspan="3"><td colspan="3"><h2>this wastes 5 bits per file</h2><h4>../include/libtorrent/torrent.hpp:1263</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		typedef std::list&lt;boost::shared_ptr&lt;torrent_plugin&gt; &gt; extension_list_t;
 		extension_list_t m_extensions;
 #endif
 
@@ -8347,7 +8424,7 @@ and is disconnected.</h2><h4>../include/libtorrent/settings_pack.hpp:1097</h4><p
 
 		// if this was added from an RSS feed, this is the unique
 		// identifier in the feed.
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(217)">../include/libtorrent/torrent.hpp:1326</a></td><td>These two bitfields should probably be coalesced into one</td></tr><tr id="217" style="display: none;" colspan="3"><td colspan="3"><h2>These two bitfields should probably be coalesced into one</h2><h4>../include/libtorrent/torrent.hpp:1326</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// the .torrent file from m_url
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(218)">../include/libtorrent/torrent.hpp:1322</a></td><td>These two bitfields should probably be coalesced into one</td></tr><tr id="218" style="display: none;" colspan="3"><td colspan="3"><h2>These two bitfields should probably be coalesced into one</h2><h4>../include/libtorrent/torrent.hpp:1322</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// the .torrent file from m_url
 //		std::vector&lt;char&gt; m_torrent_file_buf;
 
 		// this is a list of all pieces that we have announced
@@ -8398,7 +8475,7 @@ and is disconnected.</h2><h4>../include/libtorrent/settings_pack.hpp:1097</h4><p
 		// this is the time last any of our peers saw a seed
 		// in this swarm
 		time_t m_swarm_last_seen_complete;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(218)">../include/libtorrent/torrent_info.hpp:115</a></td><td>include the number of peers received from this tracker, at last announce</td></tr><tr id="218" style="display: none;" colspan="3"><td colspan="3"><h2>include the number of peers received from this tracker, at last
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(219)">../include/libtorrent/torrent_info.hpp:115</a></td><td>include the number of peers received from this tracker, at last announce</td></tr><tr id="219" 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:115</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
@@ -8450,7 +8527,7 @@ announce</h2><h4>../include/libtorrent/torrent_info.hpp:115</h4><pre style="back
 
 		// flags for the source bitmask, each indicating where
 		// we heard about this tracker
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(219)">../include/libtorrent/torrent_info.hpp:262</a></td><td>there may be some opportunities to optimize the size if torrent_info. specifically to turn some std::string and std::vector into pointers</td></tr><tr id="219" style="display: none;" colspan="3"><td colspan="3"><h2>there may be some opportunities to optimize the size if torrent_info.
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(220)">../include/libtorrent/torrent_info.hpp:262</a></td><td>there may be some opportunities to optimize the size if torrent_info. specifically to turn some std::string and std::vector into pointers</td></tr><tr id="220" style="display: none;" colspan="3"><td colspan="3"><h2>there may be some opportunities to optimize the size if torrent_info.
 specifically to turn some std::string and std::vector into pointers</h2><h4>../include/libtorrent/torrent_info.hpp:262</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// The URL of the web seed
 		std::string url;
 
@@ -8502,7 +8579,7 @@ specifically to turn some std::string and std::vector into pointers</h2><h4>../i
 		// error occur, they will simply set the error code to describe what went
 		// wrong and not fully initialize the torrent_info object. The overloads
 		// that do not take the extra error_code parameter will always throw if
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(220)">../include/libtorrent/tracker_manager.hpp:384</a></td><td>this should be unique_ptr in the future</td></tr><tr id="220" style="display: none;" colspan="3"><td colspan="3"><h2>this should be unique_ptr in the future</h2><h4>../include/libtorrent/tracker_manager.hpp:384</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// this is only used for SOCKS packets, since
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(221)">../include/libtorrent/tracker_manager.hpp:380</a></td><td>this should be unique_ptr in the future</td></tr><tr id="221" style="display: none;" colspan="3"><td colspan="3"><h2>this should be unique_ptr in the future</h2><h4>../include/libtorrent/tracker_manager.hpp:380</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// this is only used for SOCKS packets, since
 		// they may be addressed to hostname
 		virtual bool incoming_packet(error_code const&amp; e, char const* hostname
 			, char const* buf, int size);
@@ -8544,7 +8621,7 @@ specifically to turn some std::string and std::vector into pointers</h2><h4>../i
 
 #endif // TORRENT_TRACKER_MANAGER_HPP_INCLUDED
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(221)">../include/libtorrent/upnp.hpp:108</a></td><td>support using the windows API for UPnP operations as well</td></tr><tr id="221" 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:108</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(222)">../include/libtorrent/upnp.hpp:108</a></td><td>support using the windows API for UPnP operations as well</td></tr><tr id="222" 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:108</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			external_port_must_be_wildcard = 727
 		};
 
 		// hidden
@@ -8595,7 +8672,7 @@ public:
 	// to refer to mappings that fails or succeeds in the portmap_error_alert_ and
 	// portmap_alert_ respectively. If The mapping fails immediately, the return value
 	// is -1, which means failure. There will not be any error alert notification for
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(222)">../include/libtorrent/utp_stream.hpp:402</a></td><td>implement blocking write. Low priority since it's not used (yet)</td></tr><tr id="222" 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:402</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(223)">../include/libtorrent/utp_stream.hpp:402</a></td><td>implement blocking write. Low priority since it's not used (yet)</td></tr><tr id="223" 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:402</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;
@@ -8646,7 +8723,7 @@ public:
 		if (m_impl == 0)
 		{
 			m_io_service.post(boost::bind&lt;void&gt;(handler
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(223)">../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="223" 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(224)">../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="224" 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
@@ -8698,7 +8775,7 @@ public:
 	item(entry const&amp; v
 		, std::pair&lt;char const*, int&gt; salt
 		, boost::uint64_t seq, char const* pk, char const* sk);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(224)">../include/libtorrent/aux_/session_impl.hpp:849</a></td><td>should this be renamed m_outgoing_interfaces?</td></tr><tr id="224" style="display: none;" colspan="3"><td colspan="3"><h2>should this be renamed m_outgoing_interfaces?</h2><h4>../include/libtorrent/aux_/session_impl.hpp:849</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// listen socket. For each retry the port number
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(225)">../include/libtorrent/aux_/session_impl.hpp:851</a></td><td>should this be renamed m_outgoing_interfaces?</td></tr><tr id="225" style="display: none;" colspan="3"><td colspan="3"><h2>should this be renamed m_outgoing_interfaces?</h2><h4>../include/libtorrent/aux_/session_impl.hpp:851</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// listen socket. For each retry the port number
 			// is incremented by one
 			int m_listen_port_retries;
 
@@ -8749,7 +8826,7 @@ public:
 			// round-robin index into m_net_interfaces
 			mutable boost::uint8_t m_interface_index;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(225)">../include/libtorrent/aux_/session_impl.hpp:900</a></td><td>replace this by a proper asio timer</td></tr><tr id="225" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:900</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(226)">../include/libtorrent/aux_/session_impl.hpp:902</a></td><td>replace this by a proper asio timer</td></tr><tr id="226" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:902</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 			void open_new_incoming_socks_connection();
 
 			enum listen_on_flags_t
@@ -8773,7 +8850,7 @@ public:
 </div>
 			// this is used to decide when to recalculate which
 			// torrents to keep queued and which to activate
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(226)">../include/libtorrent/aux_/session_impl.hpp:905</a></td><td>replace this by a proper asio timer</td></tr><tr id="226" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:905</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(227)">../include/libtorrent/aux_/session_impl.hpp:907</a></td><td>replace this by a proper asio timer</td></tr><tr id="227" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:907</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			{
 				open_ssl_socket = 0x10
 			};
 
@@ -8799,7 +8876,7 @@ public:
 			// is only decresed when the unchoke set
 			// is recomputed, and when it reaches zero,
 			// the optimistic unchoke is moved to another peer.
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(227)">../include/libtorrent/aux_/session_impl.hpp:912</a></td><td>replace this by a proper asio timer</td></tr><tr id="227" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:912</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(228)">../include/libtorrent/aux_/session_impl.hpp:914</a></td><td>replace this by a proper asio timer</td></tr><tr id="228" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:914</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 #ifndef TORRENT_DISABLE_DHT	
 			entry m_dht_state;
 #endif
@@ -8850,7 +8927,7 @@ public:
 			int m_suggest_timer;
 
 			// statistics gathered from all torrents.
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(228)">../include/libtorrent/aux_/session_interface.hpp:250</a></td><td>it would be nice to not have this be part of session_interface</td></tr><tr id="228" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to not have this be part of session_interface</h2><h4>../include/libtorrent/aux_/session_interface.hpp:250</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(229)">../include/libtorrent/aux_/session_interface.hpp:242</a></td><td>it would be nice to not have this be part of session_interface</td></tr><tr id="229" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to not have this be part of session_interface</h2><h4>../include/libtorrent/aux_/session_interface.hpp:242</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// load the specified torrent. also evict one torrent, except
 		// for the one specified, if we are at the limit of loaded torrents
 		virtual bool load_torrent(torrent* t) = 0;
@@ -8901,7 +8978,7 @@ public:
 
 		virtual bandwidth_manager* get_bandwidth_manager(int channel) = 0;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(229)">../include/libtorrent/aux_/session_settings.hpp:78</a></td><td>make this a bitfield</td></tr><tr id="229" style="display: none;" colspan="3"><td colspan="3"><h2>make this a bitfield</h2><h4>../include/libtorrent/aux_/session_settings.hpp:78</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	if ((name &amp; settings_pack::type_mask) != settings_pack:: type ## _type_base) return default_val; \
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(230)">../include/libtorrent/aux_/session_settings.hpp:78</a></td><td>make this a bitfield</td></tr><tr id="230" style="display: none;" colspan="3"><td colspan="3"><h2>make this a bitfield</h2><h4>../include/libtorrent/aux_/session_settings.hpp:78</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	if ((name &amp; settings_pack::type_mask) != settings_pack:: type ## _type_base) return default_val; \
 	return m_ ## type ## s[name - settings_pack:: type ## _type_base]
 
 	struct TORRENT_EXTRA_EXPORT session_settings
diff --git a/docs/troubleshooting.html b/docs/troubleshooting.html
index 04783d29f..92e1c4aeb 100644
--- a/docs/troubleshooting.html
+++ b/docs/troubleshooting.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -82,7 +83,7 @@ against <tt class="docutils literal">docs/troubleshooting.dot</tt>.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/tuning.html b/docs/tuning.html
index 77f81db9b..63e23f57f 100644
--- a/docs/tuning.html
+++ b/docs/tuning.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -620,7 +621,7 @@ use case, please let us know and we'll update this document.</p>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/udp_tracker_protocol.html b/docs/udp_tracker_protocol.html
index ba8285373..c111f5b7d 100644
--- a/docs/udp_tracker_protocol.html
+++ b/docs/udp_tracker_protocol.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>Bittorrent udp-tracker protocol extension</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -597,7 +598,7 @@ arguments as extensions.</td>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/docs/utp.html b/docs/utp.html
index 27e58e5da..dd29d0588 100644
--- a/docs/utp.html
+++ b/docs/utp.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>libtorrent manual</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
-<link rel="stylesheet" type="text/css" href="rst.css" />
+<meta name=viewport content="width=device-width, initial-scale=1">
 <script type="text/javascript">
 /* <![CDATA[ */
     (function() {
@@ -19,6 +19,7 @@
 /* ]]> */
 </script>
 <link rel="stylesheet" href="style.css" type="text/css" />
+<link rel="stylesheet" type="text/css" href="rst.css" />
 <style type="text/css">
 /* Hides from IE-mac \*/
 * html pre { height: 1%; }
@@ -362,7 +363,7 @@ and socket buffers.</li>
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 </div>
 </body>
diff --git a/include/libtorrent/torrent_handle.hpp b/include/libtorrent/torrent_handle.hpp
index 4310cd399..b5eea7bb3 100644
--- a/include/libtorrent/torrent_handle.hpp
+++ b/include/libtorrent/torrent_handle.hpp
@@ -1361,13 +1361,16 @@ namespace libtorrent
 
 		// counts the amount of bytes send and received this session, but only
 		// the actual payload data (i.e the interesting data), these counters
-		// ignore any protocol overhead.
+		// ignore any protocol overhead. The session is considered to restart
+		// when a torrent is paused and restarted again. When a torrent is
+		// paused, these counters are reset to 0.
 		boost::int64_t total_payload_download;
 		boost::int64_t total_payload_upload;
 
 		// the number of bytes that has been downloaded and that has failed the
 		// piece hash test. In other words, this is just how much crap that has
-		// been downloaded.
+		// been downloaded since the torrent was last started. If a torrent is
+		// paused and then restarted again, this counter will be reset.
 		boost::int64_t total_failed_bytes;
 
 		// the number of bytes that has been downloaded even though that data
@@ -1378,7 +1381,9 @@ namespace libtorrent
 		// situation when libtorrent may re-request blocks is when the requests
 		// it sends out are not replied in FIFO-order (it will re-request blocks
 		// that are skipped by an out of order block). This is supposed to be as
-		// low as possible.
+		// low as possible. This only counts bytes since the torrent was last
+		// started. If a torrent is paused and then restarted again, this counter
+		// will be reset.
 		boost::int64_t total_redundant_bytes;
 
 		// a bitmask that represents which pieces we have (set to true) and the