diff --git a/docs/building.html b/docs/building.html
index 632cc9faa..f7a9dbc24 100644
--- a/docs/building.html
+++ b/docs/building.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/client_test.html b/docs/client_test.html
index 5dba5e8f9..0f4752f3d 100644
--- a/docs/client_test.html
+++ b/docs/client_test.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
 <script type="text/javascript">
diff --git a/docs/contributing.html b/docs/contributing.html
index 639630254..d0c693bc6 100644
--- a/docs/contributing.html
+++ b/docs/contributing.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/dht_extensions.html b/docs/dht_extensions.html
index 23b9205d3..9d46b0c39 100644
--- a/docs/dht_extensions.html
+++ b/docs/dht_extensions.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/dht_rss.html b/docs/dht_rss.html
index 51c3c93f4..bfc1ee16c 100644
--- a/docs/dht_rss.html
+++ b/docs/dht_rss.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/dht_sec.html b/docs/dht_sec.html
index 96b92fc31..d03608d52 100644
--- a/docs/dht_sec.html
+++ b/docs/dht_sec.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/dht_store.html b/docs/dht_store.html
index 534b2dc16..03a84b2aa 100644
--- a/docs/dht_store.html
+++ b/docs/dht_store.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/examples.html b/docs/examples.html
index a9e64e0e4..673ad6f13 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
@@ -218,9 +218,6 @@ instructions for how to use it <a class="reference external" href="client_test.h
     <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;-f          include sha-1 file hashes in the torrent</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            this helps supporting mixing sources from</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
-    <span class="literal string">&quot;            other networks</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>
@@ -285,51 +282,48 @@ instructions for how to use it <a class="reference external" href="client_test.h
 
       <span class="keyword">switch</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">1</span><span class="punctuation">])</span>
       <span class="punctuation">{</span>
-        <span class="keyword">case</span> <span class="literal string char">'w'</span>:
+        <span class="keyword">case</span> <span class="literal string char">'w'</span><span class="operator">:</span>
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">web_seeds</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">'t'</span>:
+        <span class="keyword">case</span> <span class="literal string char">'t'</span><span class="operator">:</span>
           <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">'p'</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>
           <span class="name">flags</span> <span class="operator">|=</span> <span class="name">create_torrent</span><span class="operator">::</span><span class="name">optimize</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="keyword">case</span> <span class="literal string char">'s'</span><span class="operator">:</span>
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">piece_size</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>
           <span class="keyword">break</span><span class="punctuation">;</span>
-        <span class="keyword">case</span> <span class="literal string char">'m'</span>:
+        <span class="keyword">case</span> <span class="literal string char">'m'</span><span class="operator">:</span>
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">merklefile</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="name">flags</span> <span class="operator">|=</span> <span class="name">create_torrent</span><span class="operator">::</span><span class="name">merkle</span><span class="punctuation">;</span>
           <span class="keyword">break</span><span class="punctuation">;</span>
-        <span class="keyword">case</span> <span class="literal string char">'o'</span>:
+        <span class="keyword">case</span> <span class="literal string char">'o'</span><span class="operator">:</span>
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">outfile</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">'f'</span>:
-          <span class="name">flags</span> <span class="operator">|=</span> <span class="name">create_torrent</span><span class="operator">::</span><span class="name">calculate_file_hashes</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="keyword">case</span> <span class="literal string char">'l'</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">symlinks</span><span class="punctuation">;</span>
           <span class="keyword">break</span><span class="punctuation">;</span>
-        <span class="keyword">case</span> <span class="literal string char">'C'</span>:
+        <span class="keyword">case</span> <span class="literal string char">'C'</span><span class="operator">:</span>
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">creator_str</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">'c'</span>:
+        <span class="keyword">case</span> <span class="literal string char">'c'</span><span class="operator">:</span>
           <span class="operator">++</span><span class="name">i</span><span class="punctuation">;</span>
           <span class="name">comment_str</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">'r'</span>:
+        <span class="keyword">case</span> <span class="literal string char">'r'</span><span class="operator">:</span>
           <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="name label">default:</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>
       <span class="punctuation">}</span>
@@ -509,7 +503,7 @@ print information about it to std out:</p>
   <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="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>
@@ -519,7 +513,7 @@ print information about it to std out:</p>
       <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="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>
@@ -531,12 +525,12 @@ print information about it to std out:</p>
       <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="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="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">size_type</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="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>
@@ -545,7 +539,7 @@ print information about it to std out:</p>
     <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="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>
@@ -649,7 +643,7 @@ print information about it to std out:</p>
   <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">st</span><span class="punctuation">.</span><span class="name">num_files</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">first</span> <span class="operator">=</span> <span class="name">st</span><span class="punctuation">.</span><span class="name">map_file</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">,</span> <span class="literal number integer">0</span><span class="punctuation">,</span> <span class="literal number integer">0</span><span class="punctuation">).</span><span class="name">piece</span><span class="punctuation">;</span>
-    <span class="keyword type">int</span> <span class="name">last</span> <span class="operator">=</span> <span class="name">st</span><span class="punctuation">.</span><span class="name">map_file</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">,</span> <span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">max</span><span class="punctuation">)(</span><span class="name">size_type</span><span class="punctuation">(</span><span class="name">st</span><span class="punctuation">.</span><span class="name">file_size</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">))</span><span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">,</span> <span class="name">size_type</span><span class="punctuation">(</span><span class="literal number integer">0</span><span class="punctuation">)),</span> <span class="literal number integer">0</span><span class="punctuation">).</span><span class="name">piece</span><span class="punctuation">;</span>
+    <span class="keyword type">int</span> <span class="name">last</span> <span class="operator">=</span> <span class="name">st</span><span class="punctuation">.</span><span class="name">map_file</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">,</span> <span class="punctuation">(</span><span class="name">std</span><span class="operator">::</span><span class="name">max</span><span class="punctuation">)(</span><span class="name">boost</span><span class="operator">::</span><span class="keyword type">int64_t</span><span class="punctuation">(</span><span class="name">st</span><span class="punctuation">.</span><span class="name">file_size</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">))</span><span class="operator">-</span><span class="literal number integer">1</span><span class="punctuation">,</span> <span class="name">boost</span><span class="operator">::</span><span class="keyword type">int64_t</span><span class="punctuation">(</span><span class="literal number integer">0</span><span class="punctuation">)),</span> <span class="literal number integer">0</span><span class="punctuation">).</span><span class="name">piece</span><span class="punctuation">;</span>
     <span class="keyword type">int</span> <span class="name">flags</span> <span class="operator">=</span> <span class="name">st</span><span class="punctuation">.</span><span class="name">file_flags</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">);</span>
     <span class="name">printf</span><span class="punctuation">(</span><span class="literal string">&quot; %8&quot;</span> <span class="name">PRIx64</span> <span class="literal string">&quot; %11&quot;</span> <span class="name">PRId64</span> <span class="literal string">&quot; %c%c%c%c [ %5d, %5d ] %7u %s %s %s%s</span><span class="literal string escape">\n</span><span class="literal string">&quot;</span>
       <span class="punctuation">,</span> <span class="name">st</span><span class="punctuation">.</span><span class="name">file_offset</span><span class="punctuation">(</span><span class="name">i</span><span class="punctuation">)</span>
diff --git a/docs/extension_protocol.html b/docs/extension_protocol.html
index 61368979b..f3c7cdd85 100644
--- a/docs/extension_protocol.html
+++ b/docs/extension_protocol.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/features.html b/docs/features.html
index b92788922..edcc57421 100644
--- a/docs/features.html
+++ b/docs/features.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/index.html b/docs/index.html
index 87b2bacfa..b22603126 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/projects.html b/docs/projects.html
index 602259c1a..fec49a230 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
 <script type="text/javascript">
diff --git a/docs/python_binding.html b/docs/python_binding.html
index 545099bb2..abb2b247f 100644
--- a/docs/python_binding.html
+++ b/docs/python_binding.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/reference-Session.html b/docs/reference-Session.html
index 03100fa04..e7a40efe0 100644
--- a/docs/reference-Session.html
+++ b/docs/reference-Session.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>Session</title>
 <meta name="author" content="Arvid Norberg, arvid&#64;libtorrent.org" />
 <link rel="stylesheet" type="text/css" href="rst.css" />
@@ -47,15 +47,15 @@
 <div class="contents topic" id="table-of-contents">
 <p class="topic-title first">Table of contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#add-torrent-params" id="id175">add_torrent_params</a></li>
-<li><a class="reference internal" href="#cache-status" id="id176">cache_status</a></li>
-<li><a class="reference internal" href="#stats-metric" id="id177">stats_metric</a></li>
-<li><a class="reference internal" href="#session-proxy" id="id178">session_proxy</a></li>
-<li><a class="reference internal" href="#id38" id="id179">session</a></li>
-<li><a class="reference internal" href="#dht-lookup" id="id180">dht_lookup</a></li>
-<li><a class="reference internal" href="#dht-routing-bucket" id="id181">dht_routing_bucket</a></li>
-<li><a class="reference internal" href="#utp-status" id="id182">utp_status</a></li>
-<li><a class="reference internal" href="#session-status" id="id183">session_status</a></li>
+<li><a class="reference internal" href="#add-torrent-params" id="id173">add_torrent_params</a></li>
+<li><a class="reference internal" href="#cache-status" id="id174">cache_status</a></li>
+<li><a class="reference internal" href="#stats-metric" id="id175">stats_metric</a></li>
+<li><a class="reference internal" href="#session-proxy" id="id176">session_proxy</a></li>
+<li><a class="reference internal" href="#id38" id="id177">session</a></li>
+<li><a class="reference internal" href="#dht-lookup" id="id178">dht_lookup</a></li>
+<li><a class="reference internal" href="#dht-routing-bucket" id="id179">dht_routing_bucket</a></li>
+<li><a class="reference internal" href="#utp-status" id="id180">utp_status</a></li>
+<li><a class="reference internal" href="#session-status" id="id181">session_status</a></li>
 </ul>
 </div>
 <a name="add_torrent_params"></a><div class="section" id="add-torrent-params">
@@ -520,8 +520,6 @@ class session: public boost::noncopyable
       , int flags = start_default_features | add_default_plugins
       , int alert_mask = alert::error_notification);
    <strong>session</strong> (settings_pack const&amp; pack
-      , fingerprint const&amp; print = fingerprint(&quot;LT&quot;
-      , LIBTORRENT_VERSION_MAJOR, LIBTORRENT_VERSION_MINOR, 0, 0)
       , int flags = start_default_features | add_default_plugins);
    <strong>~session</strong> ();
    void <strong>load_state</strong> (lazy_entry const&amp; e);
@@ -567,7 +565,6 @@ class session: public boost::noncopyable
    void <strong>set_ip_filter</strong> (ip_filter const&amp; f);
    void <strong>set_port_filter</strong> (port_filter const&amp; f);
    peer_id <strong>id</strong> () const;
-   void <strong>set_peer_id</strong> (peer_id const&amp; pid);
    void <strong>set_key</strong> (int key);
    bool <strong>is_listening</strong> () const;
    unsigned short <strong>listen_port</strong> () const;
@@ -615,27 +612,7 @@ class session: public boost::noncopyable
    };
 };
 </pre>
-<a name="session()"></a><div class="section" id="id45">
-<h2>session()</h2>
-<pre class="literal-block">
-<strong>session</strong> (fingerprint const&amp; print = fingerprint(&quot;LT&quot;
-      , LIBTORRENT_VERSION_MAJOR, LIBTORRENT_VERSION_MINOR, 0, 0)
-      , int flags = start_default_features | add_default_plugins
-      , boost::uint32_t alert_mask = alert::error_notification);
-<strong>session</strong> (fingerprint const&amp; print
-      , std::pair&lt;int, int&gt; listen_port_range
-      , char const* listen_interface = &quot;0.0.0.0&quot;
-      , int flags = start_default_features | add_default_plugins
-      , int alert_mask = alert::error_notification);
-<strong>session</strong> (settings_pack const&amp; pack
-      , fingerprint const&amp; print = fingerprint(&quot;LT&quot;
-      , LIBTORRENT_VERSION_MAJOR, LIBTORRENT_VERSION_MINOR, 0, 0)
-      , int flags = start_default_features | add_default_plugins);
-</pre>
-<p>TODO: 3 could the fingerprint be a setting as well? And should the
-<a class="reference external" href="reference-Settings.html#settings_pack">settings_pack</a> be optional?</p>
-<a name="~session()"></a></div>
-<div class="section" id="id47">
+<a name="~session()"></a><div class="section" id="id45">
 <h2>~session()</h2>
 <pre class="literal-block">
 <strong>~session</strong> ();
@@ -916,7 +893,7 @@ void <strong>dht_get_item</strong> (sha1_hash const&amp; target);
 <p>query the DHT for an immutable item at the <tt class="docutils literal">target</tt> hash.
 the result is posted as a <a class="reference external" href="reference-Alerts.html#dht_immutable_item_alert">dht_immutable_item_alert</a>.</p>
 <a name="dht_get_item()"></a></div>
-<div class="section" id="id104">
+<div class="section" id="id102">
 <h2>dht_get_item()</h2>
 <pre class="literal-block">
 void <strong>dht_get_item</strong> (boost::array&lt;char, 32&gt; key
@@ -938,7 +915,7 @@ the returned hash is the key that is to be used to look the item
 up agan. It's just the sha-1 hash of the bencoded form of the
 structure.</p>
 <a name="dht_put_item()"></a></div>
-<div class="section" id="id106">
+<div class="section" id="id104">
 <h2>dht_put_item()</h2>
 <pre class="literal-block">
 void <strong>dht_put_item</strong> (boost::array&lt;char, 32&gt; key
@@ -1057,16 +1034,14 @@ void <strong>set_port_filter</strong> (port_filter const&amp; f);
 will reject making outgoing peer connections to certain remote ports.
 The main intention is to be able to avoid triggering certain
 anti-virus software by connecting to SMTP, FTP ports.</p>
-<a name="set_peer_id()"></a>
 <a name="id()"></a></div>
-<div class="section" id="set-peer-id-id">
-<h2>set_peer_id() id()</h2>
+<div class="section" id="id">
+<h2>id()</h2>
 <pre class="literal-block">
 peer_id <strong>id</strong> () const;
-void <strong>set_peer_id</strong> (peer_id const&amp; pid);
 </pre>
-<p>sets and gets the raw peer ID used by libtorrent. When anonymous
-mode is set the peer ID is randomized per peer anyway.</p>
+<p>returns the raw peer ID used by libtorrent. When anonymous mode is set
+the peer ID is randomized per peer.</p>
 <a name="set_key()"></a></div>
 <div class="section" id="set-key">
 <h2>set_key()</h2>
diff --git a/docs/settings.rst b/docs/settings.rst
index 13e74e8d0..f90934c17 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -10,12 +10,11 @@
 | user_agent | string | "libtorrent/" LIBTORRENT_VERSION |
 +------------+--------+----------------------------------+
 
-this is the client identification to the tracker.
-The recommended format of this string is:
-"ClientName/ClientVersion libtorrent/libtorrentVersion".
-This name will not only be used when making HTTP requests, but also when
-sending extended headers to peers that support that extension.
-It may not contain \r or \n
+this is the client identification to the tracker. The recommended
+format of this string is: "ClientName/ClientVersion
+libtorrent/libtorrentVersion". This name will not only be used when
+making HTTP requests, but also when sending extended headers to
+peers that support that extension. It may not contain \r or \n
 
 .. _announce_ip:
 
@@ -29,8 +28,9 @@ It may not contain \r or \n
 | announce_ip | string | 0       |
 +-------------+--------+---------+
 
-``announce_ip`` is the ip address passed along to trackers as the ``&ip=`` parameter.
-If left as the default, that parameter is omitted.
+``announce_ip`` is the ip address passed along to trackers as the
+``&ip=`` parameter. If left as the default, that parameter is
+omitted.
 
 .. _mmap_cache:
 
@@ -44,25 +44,29 @@ If left as the default, that parameter is omitted.
 | mmap_cache | string | 0       |
 +------------+--------+---------+
 
-``mmap_cache`` may be set to a filename where the disk cache will be mmapped
-to. This could be useful, for instance, to map the disk cache from regular
-rotating hard drives onto an SSD drive. Doing that effectively introduces
-a second layer of caching, allowing the disk cache to be as big as can
-fit on an SSD drive (probably about one order of magnitude more than the
-available RAM). The intention of this setting is to set it up once at the
-start up and not change it while running. The setting may not be changed
-as long as there are any disk buffers in use. This default to the empty
-string, which means use regular RAM allocations for the disk cache. The file
-specified will be created and truncated to the disk cache size (``cache_size``).
-Any existing file with the same name will be replaced.
+``mmap_cache`` may be set to a filename where the disk cache will
+be mmapped to. This could be useful, for instance, to map the disk
+cache from regular rotating hard drives onto an SSD drive. Doing
+that effectively introduces a second layer of caching, allowing the
+disk cache to be as big as can fit on an SSD drive (probably about
+one order of magnitude more than the available RAM). The intention
+of this setting is to set it up once at the start up and not change
+it while running. The setting may not be changed as long as there
+are any disk buffers in use. This default to the empty string,
+which means use regular RAM allocations for the disk cache. The
+file specified will be created and truncated to the disk cache size
+(``cache_size``). Any existing file with the same name will be
+replaced.
 
-Since this setting sets a hard upper limit on cache usage, it cannot be combined
-with ``session_settings::contiguous_recv_buffer``, since that feature treats the
-``cache_size`` setting as a soft (but still pretty hard) limit. The result of combining
-the two is peers being disconnected after failing to allocate more disk buffers.
+Since this setting sets a hard upper limit on cache usage, it
+cannot be combined with
+``session_settings::contiguous_recv_buffer``, since that feature
+treats the ``cache_size`` setting as a soft (but still pretty hard)
+limit. The result of combining the two is peers being disconnected
+after failing to allocate more disk buffers.
 
-This feature requires the ``mmap`` system call, on systems that don't have ``mmap``
-this setting is ignored.
+This feature requires the ``mmap`` system call, on systems that
+don't have ``mmap`` this setting is ignored.
 
 .. _handshake_client_version:
 
@@ -76,8 +80,9 @@ this setting is ignored.
 | handshake_client_version | string | 0       |
 +--------------------------+--------+---------+
 
-this is the client name and version identifier sent to peers in the handshake
-message. If this is an empty string, the user_agent is used instead
+this is the client name and version identifier sent to peers in the
+handshake message. If this is an empty string, the user_agent is
+used instead
 
 .. _outgoing_interfaces:
 
@@ -95,13 +100,13 @@ sets the network interface this session will use when it opens
 outgoing connections. By default, it binds outgoing connections to
 INADDR_ANY and port 0 (i.e. let the OS decide). Ths parameter must
 be a string containing one or more, comma separated, adapter names.
-Adapter names on unix systems are of the form "eth0", "eth1", "tun0",
-etc. When specifying multiple
-interfaces, they will be assigned in round-robin order. This may be
-useful for clients that are multi-homed. Binding an outgoing
-connection to a local IP does not necessarily make the connection
-via the associated NIC/Adapter. Setting this to an empty string
-will disable binding of outgoing connections.
+Adapter names on unix systems are of the form "eth0", "eth1",
+"tun0", etc. When specifying multiple interfaces, they will be
+assigned in round-robin order. This may be useful for clients that
+are multi-homed. Binding an outgoing connection to a local IP does
+not necessarily make the connection via the associated NIC/Adapter.
+Setting this to an empty string will disable binding of outgoing
+connections.
 
 .. _listen_interfaces:
 
@@ -166,8 +171,8 @@ see proxy_type.
 | proxy_password | string | ""      |
 +----------------+--------+---------+
 
-when using a proxy, these are the credentials (if any) to use
-whne connecting to it. see proxy_type
+when using a proxy, these are the credentials (if any) to use whne
+connecting to it. see proxy_type
 
 .. _i2p_hostname:
 
@@ -186,6 +191,22 @@ sets the i2p_ SAM bridge to connect to. set the port with the
 
 .. _i2p: http://www.i2p2.de
 
+.. _peer_fingerprint:
+
+.. raw:: html
+
+	<a name="peer_fingerprint"></a>
+
++------------------+--------+------------+
+| name             | type   | default    |
++==================+========+============+
+| peer_fingerprint | string | "-LT1100-" |
++------------------+--------+------------+
+
+this is the fingerprint for the client. It will be used as the
+prefix to the peer_id. If this is 20 bytes (or longer) it will be
+used as the peer-id
+
 .. _allow_multiple_connections_per_ip:
 
 .. raw:: html
@@ -198,12 +219,11 @@ sets the i2p_ SAM bridge to connect to. set the port with the
 | allow_multiple_connections_per_ip | bool | false   |
 +-----------------------------------+------+---------+
 
-determines if connections from the same IP address as
-existing connections should be rejected or not. Multiple
-connections from the same IP address is not allowed by
-default, to prevent abusive behavior by peers. It may
-be useful to allow such connections in cases where
-simulations are run on the same machie, and all peers
+determines if connections from the same IP address as existing
+connections should be rejected or not. Multiple connections from
+the same IP address is not allowed by default, to prevent abusive
+behavior by peers. It may be useful to allow such connections in
+cases where simulations are run on the same machie, and all peers
 in a swarm has the same IP address.
 
 .. _send_redundant_have:
@@ -218,11 +238,11 @@ in a swarm has the same IP address.
 | send_redundant_have | bool | true    |
 +---------------------+------+---------+
 
-if set to true, upload, download and unchoke limits
-are ignored for peers on the local network.
-This option is *DEPRECATED*, please use set_peer_class_filter() instead.
-``send_redundant_have`` controls if have messages will be sent
-to peers that already have the piece. This is typically not necessary,
+if set to true, upload, download and unchoke limits are ignored for
+peers on the local network. This option is *DEPRECATED*, please use
+set_peer_class_filter() instead.
+``send_redundant_have`` controls if have messages will be sent to
+peers that already have the piece. This is typically not necessary,
 but it might be necessary for collecting statistics in some cases.
 Default is false.
 
@@ -239,9 +259,9 @@ Default is false.
 +----------------+------+---------+
 
 if this is true, outgoing bitfields will never be fuil. If the
-client is seed, a few bits will be set to 0, and later filled
-in with have messages. This is to prevent certain ISPs
-from stopping people from seeding.
+client is seed, a few bits will be set to 0, and later filled in
+with have messages. This is to prevent certain ISPs from stopping
+people from seeding.
 
 .. _use_dht_as_fallback:
 
@@ -255,10 +275,11 @@ from stopping people from seeding.
 | use_dht_as_fallback | bool | false   |
 +---------------------+------+---------+
 
-``use_dht_as_fallback`` determines how the DHT is used. If this is true,
-the DHT will only be used for torrents where all trackers in its tracker
-list has failed. Either by an explicit error message or a time out. This
-is false by default, which means the DHT is used by default regardless of
+``use_dht_as_fallback`` determines how the DHT is used. If this is
+true, the DHT will only be used for torrents where all trackers in
+its tracker list has failed. Either by an explicit error message or
+a time out. This is false by default, which means the DHT is used
+by default regardless of if the trackers fail or not.
 
 .. _upnp_ignore_nonrouters:
 
@@ -272,10 +293,10 @@ is false by default, which means the DHT is used by default regardless of
 | upnp_ignore_nonrouters | bool | false   |
 +------------------------+------+---------+
 
-``upnp_ignore_nonrouters`` indicates whether or not the UPnP implementation
-should ignore any broadcast response from a device whose address is not the
-configured router for this machine. i.e. it's a way to not talk to other
-people's routers by mistake.
+``upnp_ignore_nonrouters`` indicates whether or not the UPnP
+implementation should ignore any broadcast response from a device
+whose address is not the configured router for this machine. i.e.
+it's a way to not talk to other people's routers by mistake.
 
 .. _use_parole_mode:
 
@@ -289,11 +310,12 @@ people's routers by mistake.
 | use_parole_mode | bool | true    |
 +-----------------+------+---------+
 
-``use_parole_mode`` specifies if parole mode should be used. Parole mode means
-that peers that participate in pieces that fail the hash check are put in a mode
-where they are only allowed to download whole pieces. If the whole piece a peer
-in parole mode fails the hash check, it is banned. If a peer participates in a
-piece that passes the hash check, it is taken out of parole mode.
+``use_parole_mode`` specifies if parole mode should be used. Parole
+mode means that peers that participate in pieces that fail the hash
+check are put in a mode where they are only allowed to download
+whole pieces. If the whole piece a peer in parole mode fails the
+hash check, it is banned. If a peer participates in a piece that
+passes the hash check, it is taken out of parole mode.
 
 .. _use_read_cache:
 
@@ -312,13 +334,12 @@ piece that passes the hash check, it is taken out of parole mode.
 | use_write_cache | bool | true    |
 +-----------------+------+---------+
 
-enable and disable caching of read blocks and
-blocks to be written to disk respsectively.
-the purpose of the read cache is partly read-ahead of requests
-but also to avoid reading blocks back from the disk multiple
-times for popular pieces.
-the write cache purpose is to hold off writing blocks to disk until
-they have been hashed, to avoid having to read them back in again.
+enable and disable caching of read blocks and blocks to be written
+to disk respsectively. the purpose of the read cache is partly
+read-ahead of requests but also to avoid reading blocks back from
+the disk multiple times for popular pieces. the write cache purpose
+is to hold off writing blocks to disk until they have been hashed,
+to avoid having to read them back in again.
 
 .. _dont_flush_write_cache:
 
@@ -332,9 +353,9 @@ they have been hashed, to avoid having to read them back in again.
 | dont_flush_write_cache | bool | false   |
 +------------------------+------+---------+
 
-this will make the disk cache never flush a write
-piece if it would cause is to have to re-read it
-once we want to calculate the piece hash
+this will make the disk cache never flush a write piece if it would
+cause is to have to re-read it once we want to calculate the piece
+hash
 
 .. _explicit_read_cache:
 
@@ -348,12 +369,14 @@ once we want to calculate the piece hash
 | explicit_read_cache | bool | false   |
 +---------------------+------+---------+
 
-``explicit_read_cache`` defaults to 0. If set to something greater than 0, the
-disk read cache will not be evicted by cache misses and will explicitly be
-controlled based on the rarity of pieces. Rare pieces are more likely to be
-cached. This would typically be used together with ``suggest_mode`` set to
-``suggest_read_cache``. The value is the number of pieces to keep in the read
-cache. If the actual read cache can't fit as many, it will essentially be clamped.
+``explicit_read_cache`` defaults to 0. If set to something greater
+than 0, the disk read cache will not be evicted by cache misses and
+will explicitly be controlled based on the rarity of pieces. Rare
+pieces are more likely to be cached. This would typically be used
+together with ``suggest_mode`` set to ``suggest_read_cache``. The
+value is the number of pieces to keep in the read cache. If the
+actual read cache can't fit as many, it will essentially be
+clamped.
 
 .. _coalesce_reads:
 
@@ -372,9 +395,9 @@ cache. If the actual read cache can't fit as many, it will essentially be clampe
 | coalesce_writes | bool | false   |
 +-----------------+------+---------+
 
-allocate separate, contiguous, buffers for read and
-write calls. Only used where writev/readv cannot be used
-will use more RAM but may improve performance
+allocate separate, contiguous, buffers for read and write calls.
+Only used where writev/readv cannot be used will use more RAM but
+may improve performance
 
 .. _auto_manage_prefer_seeds:
 
@@ -388,7 +411,7 @@ will use more RAM but may improve performance
 | auto_manage_prefer_seeds | bool | false   |
 +--------------------------+------+---------+
 
-prefer seeding torrents when determining which torrents to give 
+prefer seeding torrents when determining which torrents to give
 active slots to, the default is false which gives preference to
 downloading torrents
 
@@ -404,10 +427,11 @@ downloading torrents
 | dont_count_slow_torrents | bool | true    |
 +--------------------------+------+---------+
 
-if ``dont_count_slow_torrents`` is true, torrents without any payload transfers are
-not subject to the ``active_seeds`` and ``active_downloads`` limits. This is intended
-to make it more likely to utilize all available bandwidth, and avoid having torrents
-that don't transfer anything block the active slots.
+if ``dont_count_slow_torrents`` is true, torrents without any
+payload transfers are not subject to the ``active_seeds`` and
+``active_downloads`` limits. This is intended to make it more
+likely to utilize all available bandwidth, and avoid having
+torrents that don't transfer anything block the active slots.
 
 .. _close_redundant_connections:
 
@@ -421,10 +445,10 @@ that don't transfer anything block the active slots.
 | close_redundant_connections | bool | true    |
 +-----------------------------+------+---------+
 
-``close_redundant_connections`` specifies whether libtorrent should close
-connections where both ends have no utility in keeping the connection open.
-For instance if both ends have completed their downloads, there's no point
-in keeping it open.
+``close_redundant_connections`` specifies whether libtorrent should
+close connections where both ends have no utility in keeping the
+connection open. For instance if both ends have completed their
+downloads, there's no point in keeping it open.
 
 .. _prioritize_partial_pieces:
 
@@ -455,9 +479,8 @@ proportion.
 | rate_limit_ip_overhead | bool | true    |
 +------------------------+------+---------+
 
-if set to true, the estimated TCP/IP overhead is
-drained from the rate limiters, to avoid exceeding
-the limits with the total traffic
+if set to true, the estimated TCP/IP overhead is drained from the
+rate limiters, to avoid exceeding the limits with the total traffic
 
 .. _announce_to_all_tiers:
 
@@ -476,17 +499,18 @@ the limits with the total traffic
 | announce_to_all_trackers | bool | false   |
 +--------------------------+------+---------+
 
-``announce_to_all_trackers`` controls how multi tracker torrents are
-treated. If this is set to true, all trackers in the same tier are
-announced to in parallel. If all trackers in tier 0 fails, all trackers
-in tier 1 are announced as well. If it's set to false, the behavior is as
-defined by the multi tracker specification. It defaults to false, which
-is the same behavior previous versions of libtorrent has had as well.
+``announce_to_all_trackers`` controls how multi tracker torrents
+are treated. If this is set to true, all trackers in the same tier
+are announced to in parallel. If all trackers in tier 0 fails, all
+trackers in tier 1 are announced as well. If it's set to false, the
+behavior is as defined by the multi tracker specification. It
+defaults to false, which is the same behavior previous versions of
+libtorrent has had as well.
 
-``announce_to_all_tiers`` also controls how multi tracker torrents are
-treated. When this is set to true, one tracker from each tier is announced
-to. This is the uTorrent behavior. This is false by default in order
-to comply with the multi-tracker specification.
+``announce_to_all_tiers`` also controls how multi tracker torrents
+are treated. When this is set to true, one tracker from each tier
+is announced to. This is the uTorrent behavior. This is false by
+default in order to comply with the multi-tracker specification.
 
 .. _prefer_udp_trackers:
 
@@ -500,11 +524,11 @@ to comply with the multi-tracker specification.
 | prefer_udp_trackers | bool | true    |
 +---------------------+------+---------+
 
-``prefer_udp_trackers`` is true by default. It means that trackers may
-be rearranged in a way that udp trackers are always tried before http
-trackers for the same hostname. Setting this to false means that the
-trackers' tier is respected and there's no preference of one protocol
-over another.
+``prefer_udp_trackers`` is true by default. It means that trackers
+may be rearranged in a way that udp trackers are always tried
+before http trackers for the same hostname. Setting this to false
+means that the trackers' tier is respected and there's no
+preference of one protocol over another.
 
 .. _strict_super_seeding:
 
@@ -519,8 +543,8 @@ over another.
 +----------------------+------+---------+
 
 ``strict_super_seeding`` when this is set to true, a piece has to
-have been forwarded to a third peer before another one is handed out.
-This is the traditional definition of super seeding.
+have been forwarded to a third peer before another one is handed
+out. This is the traditional definition of super seeding.
 
 .. _lock_disk_cache:
 
@@ -534,10 +558,10 @@ This is the traditional definition of super seeding.
 | lock_disk_cache | bool | false   |
 +-----------------+------+---------+
 
-if this is set to true, the memory allocated for the
-disk cache will be locked in physical RAM, never to
-be swapped out. Every time a disk buffer is allocated
-and freed, there will be the extra overhead of a system call.
+if this is set to true, the memory allocated for the disk cache
+will be locked in physical RAM, never to be swapped out. Every time
+a disk buffer is allocated and freed, there will be the extra
+overhead of a system call.
 
 .. _disable_hash_checks:
 
@@ -551,12 +575,10 @@ and freed, there will be the extra overhead of a system call.
 | disable_hash_checks | bool | false   |
 +---------------------+------+---------+
 
-when set to true, all data downloaded from
-peers will be assumed to be correct, and not
-tested to match the hashes in the torrent
-this is only useful for simulation and
-testing purposes (typically combined with
-disabled_storage)
+when set to true, all data downloaded from peers will be assumed to
+be correct, and not tested to match the hashes in the torrent this
+is only useful for simulation and testing purposes (typically
+combined with disabled_storage)
 
 .. _allow_i2p_mixed:
 
@@ -570,13 +592,11 @@ disabled_storage)
 | allow_i2p_mixed | bool | false   |
 +-----------------+------+---------+
 
-if this is true, i2p torrents are allowed
-to also get peers from other sources than
-the tracker, and connect to regular IPs,
-not providing any anonymization. This may
-be useful if the user is not interested in
-the anonymization of i2p, but still wants to
-be able to connect to i2p peers.
+if this is true, i2p torrents are allowed to also get peers from
+other sources than the tracker, and connect to regular IPs, not
+providing any anonymization. This may be useful if the user is not
+interested in the anonymization of i2p, but still wants to be able
+to connect to i2p peers.
 
 .. _low_prio_disk:
 
@@ -590,13 +610,13 @@ be able to connect to i2p peers.
 | low_prio_disk | bool | true    |
 +---------------+------+---------+
 
-``low_prio_disk`` determines if the disk I/O should use a normal
-or low priority policy. This defaults to true, which means that
-it's low priority by default. Other processes doing disk I/O will
+``low_prio_disk`` determines if the disk I/O should use a normal or
+low priority policy. This defaults to true, which means that it's
+low priority by default. Other processes doing disk I/O will
 normally take priority in this mode. This is meant to improve the
 overall responsiveness of the system while downloading in the
-background. For high-performance server setups, this might not
-be desirable.
+background. For high-performance server setups, this might not be
+desirable.
 
 .. _volatile_read_cache:
 
@@ -614,7 +634,8 @@ be desirable.
 that are hit by peer read requests are removed from the disk cache
 to free up more space. This is useful if you don't expect the disk
 cache to create any cache hits from other peers than the one who
-triggered the cache line to be read into the cache in the first place.
+triggered the cache line to be read into the cache in the first
+place.
 
 .. _guided_read_cache:
 
@@ -628,9 +649,9 @@ triggered the cache line to be read into the cache in the first place.
 | guided_read_cache | bool | false   |
 +-------------------+------+---------+
 
-``guided_read_cache`` enables the disk cache to adjust the size
-of a cache line generated by peers to depend on the upload rate
-you are sending to that peer. The intention is to optimize the RAM
+``guided_read_cache`` enables the disk cache to adjust the size of
+a cache line generated by peers to depend on the upload rate you
+are sending to that peer. The intention is to optimize the RAM
 usage of the cache, to read ahead further for peers that you're
 sending faster to.
 
@@ -663,11 +684,11 @@ some disk performance improvements.
 +---------------------------------+------+---------+
 
 ``incoming_starts_queued_torrents`` defaults to false. If a torrent
-has been paused by the auto managed feature in libtorrent, i.e.
-the torrent is paused and auto managed, this feature affects whether
-or not it is automatically started on an incoming connection. The
-main reason to queue torrents, is not to make them unavailable, but
-to save on the overhead of announcing to the trackers, the DHT and to
+has been paused by the auto managed feature in libtorrent, i.e. the
+torrent is paused and auto managed, this feature affects whether or
+not it is automatically started on an incoming connection. The main
+reason to queue torrents, is not to make them unavailable, but to
+save on the overhead of announcing to the trackers, the DHT and to
 avoid spreading one's unchoke slots too thin. If a peer managed to
 find us, even though we're no in the torrent anymore, this setting
 can make us start the torrent and serve it.
@@ -684,10 +705,10 @@ can make us start the torrent and serve it.
 | report_true_downloaded | bool | false   |
 +------------------------+------+---------+
 
-when set to true, the downloaded counter sent to trackers
-will include the actual number of payload bytes donwnloaded
-including redundant bytes. If set to false, it will not include
-any redundany bytes
+when set to true, the downloaded counter sent to trackers will
+include the actual number of payload bytes donwnloaded including
+redundant bytes. If set to false, it will not include any redundany
+bytes
 
 .. _strict_end_game_mode:
 
@@ -701,14 +722,15 @@ any redundany bytes
 | strict_end_game_mode | bool | true    |
 +----------------------+------+---------+
 
-``strict_end_game_mode`` defaults to true, and controls when a block
-may be requested twice. If this is ``true``, a block may only be requested
-twice when there's ay least one request to every piece that's left to
-download in the torrent. This may slow down progress on some pieces
-sometimes, but it may also avoid downloading a lot of redundant bytes.
-If this is ``false``, libtorrent attempts to use each peer connection
-to its max, by always requesting something, even if it means requesting
-something that has been requested from another peer already.
+``strict_end_game_mode`` defaults to true, and controls when a
+block may be requested twice. If this is ``true``, a block may only
+be requested twice when there's ay least one request to every piece
+that's left to download in the torrent. This may slow down progress
+on some pieces sometimes, but it may also avoid downloading a lot
+of redundant bytes. If this is ``false``, libtorrent attempts to
+use each peer connection to its max, by always requesting
+something, even if it means requesting something that has been
+requested from another peer already.
 
 .. _broadcast_lsd:
 
@@ -722,8 +744,8 @@ something that has been requested from another peer already.
 | broadcast_lsd | bool | true    |
 +---------------+------+---------+
 
-if ``broadcast_lsd`` is set to true, the local peer discovery
-(or Local Service Discovery) will not only use IP multicast, but also
+if ``broadcast_lsd`` is set to true, the local peer discovery (or
+Local Service Discovery) will not only use IP multicast, but also
 broadcast its messages. This can be useful when running on networks
 that don't support multicast. Since broadcast messages might be
 expensive and disruptive on networks, only every 8th announce uses
@@ -756,9 +778,9 @@ broadcast.
 | enable_incoming_tcp | bool | true    |
 +---------------------+------+---------+
 
-when set to true, libtorrent will try to make outgoing utp connections
-controls whether libtorrent will accept incoming connections or make
-outgoing connections of specific type.
+when set to true, libtorrent will try to make outgoing utp
+connections controls whether libtorrent will accept incoming
+connections or make outgoing connections of specific type.
 
 .. _ignore_resume_timestamps:
 
@@ -772,14 +794,15 @@ outgoing connections of specific type.
 | ignore_resume_timestamps | bool | false   |
 +--------------------------+------+---------+
 
-``ignore_resume_timestamps`` determines if the storage, when loading
-resume data files, should verify that the file modification time
-with the timestamps in the resume data. This defaults to false, which
-means timestamps are taken into account, and resume data is less likely
-to accepted (torrents are more likely to be fully checked when loaded).
-It might be useful to set this to true if your network is faster than your
-disk, and it would be faster to redownload potentially missed pieces than
-to go through the whole storage to look for them.
+``ignore_resume_timestamps`` determines if the storage, when
+loading resume data files, should verify that the file modification
+time with the timestamps in the resume data. This defaults to
+false, which means timestamps are taken into account, and resume
+data is less likely to accepted (torrents are more likely to be
+fully checked when loaded). It might be useful to set this to true
+if your network is faster than your disk, and it would be faster to
+redownload potentially missed pieces than to go through the whole
+storage to look for them.
 
 .. _no_recheck_incomplete_resume:
 
@@ -793,12 +816,12 @@ to go through the whole storage to look for them.
 | no_recheck_incomplete_resume | bool | false   |
 +------------------------------+------+---------+
 
-``no_recheck_incomplete_resume`` determines if the storage should check
-the whole files when resume data is incomplete or missing or whether
-it should simply assume we don't have any of the data. By default, this
-is determined by the existance of any of the files. By setting this setting
-to true, the files won't be checked, but will go straight to download
-mode.
+``no_recheck_incomplete_resume`` determines if the storage should
+check the whole files when resume data is incomplete or missing or
+whether it should simply assume we don't have any of the data. By
+default, this is determined by the existance of any of the files.
+By setting this setting to true, the files won't be checked, but
+will go straight to download mode.
 
 .. _anonymous_mode:
 
@@ -812,17 +835,19 @@ mode.
 | anonymous_mode | bool | false   |
 +----------------+------+---------+
 
-``anonymous_mode`` defaults to false. When set to true, the client tries
-to hide its identity to a certain degree. The peer-ID will no longer
-include the client's fingerprint. The user-agent will be reset to an
-empty string. Trackers will only be used if they are using a proxy
-server. The listen sockets are closed, and incoming connections will
-only be accepted through a SOCKS5 or I2P proxy (if a peer proxy is set up and
-is run on the same machine as the tracker proxy). Since no incoming connections
-are accepted, NAT-PMP, UPnP, DHT and local peer discovery are all turned off
-when this setting is enabled.
+``anonymous_mode`` defaults to false. When set to true, the client
+tries to hide its identity to a certain degree. The peer-ID will no
+longer include the client's fingerprint. The user-agent will be
+reset to an empty string. Trackers will only be used if they are
+using a proxy server. The listen sockets are closed, and incoming
+connections will only be accepted through a SOCKS5 or I2P proxy (if
+a peer proxy is set up and is run on the same machine as the
+tracker proxy). Since no incoming connections are accepted,
+NAT-PMP, UPnP, DHT and local peer discovery are all turned off when
+this setting is enabled.
 
-If you're using I2P, it might make sense to enable anonymous mode as well.
+If you're using I2P, it might make sense to enable anonymous mode
+as well.
 
 .. _report_web_seed_downloads:
 
@@ -853,12 +878,14 @@ libtorrent API.
 | utp_dynamic_sock_buf | bool | true    |
 +----------------------+------+---------+
 
-controls if the uTP socket manager is allowed to increase
-the socket buffer if a network interface with a large MTU is used (such as loopback
-or ethernet jumbo frames). This defaults to true and might improve uTP throughput.
-For RAM constrained systems, disabling this typically saves around 30kB in user space
-and probably around 400kB in kernel socket buffers (it adjusts the send and receive
-buffer size on the kernel socket, both for IPv4 and IPv6).
+controls if the uTP socket manager is allowed to increase the
+socket buffer if a network interface with a large MTU is used (such
+as loopback or ethernet jumbo frames). This defaults to true and
+might improve uTP throughput. For RAM constrained systems,
+disabling this typically saves around 30kB in user space and
+probably around 400kB in kernel socket buffers (it adjusts the send
+and receive buffer size on the kernel socket, both for IPv4 and
+IPv6).
 
 .. _announce_double_nat:
 
@@ -872,12 +899,12 @@ buffer size on the kernel socket, both for IPv4 and IPv6).
 | announce_double_nat | bool | false   |
 +---------------------+------+---------+
 
-set to true if uTP connections should be rate limited
-This option is *DEPRECATED*, please use set_peer_class_filter() instead.
-if this is true, the ``&ip=`` argument in tracker requests
-(unless otherwise specified) will be set to the intermediate
-IP address if the user is double NATed. If ther user is not
-double NATed, this option does not have an affect
+set to true if uTP connections should be rate limited This option
+is *DEPRECATED*, please use set_peer_class_filter() instead.
+if this is true, the ``&ip=`` argument in tracker requests (unless
+otherwise specified) will be set to the intermediate IP address if
+the user is double NATed. If ther user is not double NATed, this
+option does not have an affect
 
 .. _seeding_outgoing_connections:
 
@@ -891,12 +918,13 @@ double NATed, this option does not have an affect
 | seeding_outgoing_connections | bool | true    |
 +------------------------------+------+---------+
 
-``seeding_outgoing_connections`` determines if seeding (and finished) torrents
-should attempt to make outgoing connections or not. By default this is true. It
-may be set to false in very specific applications where the cost of making
-outgoing connections is high, and there are no or small benefits of doing so.
-For instance, if no nodes are behind a firewall or a NAT, seeds don't need to
-make outgoing connections.
+``seeding_outgoing_connections`` determines if seeding (and
+finished) torrents should attempt to make outgoing connections or
+not. By default this is true. It may be set to false in very
+specific applications where the cost of making outgoing connections
+is high, and there are no or small benefits of doing so. For
+instance, if no nodes are behind a firewall or a NAT, seeds don't
+need to make outgoing connections.
 
 .. _no_connect_privileged_ports:
 
@@ -926,11 +954,13 @@ precaution to avoid being part of a DDoS attack
 | smooth_connects | bool | true    |
 +-----------------+------+---------+
 
-``smooth_connects`` is true by default, which means the number of connection
-attempts per second may be limited to below the ``connection_speed``, in case
-we're close to bump up against the limit of number of connections. The intention
-of this setting is to more evenly distribute our connection attempts over time,
-instead of attempting to connectin in batches, and timing them out in batches.
+``smooth_connects`` is true by default, which means the number of
+connection attempts per second may be limited to below the
+``connection_speed``, in case we're close to bump up against the
+limit of number of connections. The intention of this setting is to
+more evenly distribute our connection attempts over time, instead
+of attempting to connectin in batches, and timing them out in
+batches.
 
 .. _always_send_user_agent:
 
@@ -959,10 +989,10 @@ the first request per http connection will include the user agent
 | apply_ip_filter_to_trackers | bool | true    |
 +-----------------------------+------+---------+
 
-``apply_ip_filter_to_trackers`` defaults to true. It determines whether the
-IP filter applies to trackers as well as peers. If this is set to false,
-trackers are exempt from the IP filter (if there is one). If no IP filter
-is set, this setting is irrelevant.
+``apply_ip_filter_to_trackers`` defaults to true. It determines
+whether the IP filter applies to trackers as well as peers. If this
+is set to false, trackers are exempt from the IP filter (if there
+is one). If no IP filter is set, this setting is irrelevant.
 
 .. _use_disk_read_ahead:
 
@@ -976,9 +1006,9 @@ is set, this setting is irrelevant.
 | use_disk_read_ahead | bool | true    |
 +---------------------+------+---------+
 
-``use_disk_read_ahead`` defaults to true and will attempt to optimize disk reads
-by giving the operating system heads up of disk read requests as they are queued
-in the disk job queue.
+``use_disk_read_ahead`` defaults to true and will attempt to
+optimize disk reads by giving the operating system heads up of disk
+read requests as they are queued in the disk job queue.
 
 .. _lock_files:
 
@@ -992,10 +1022,12 @@ in the disk job queue.
 | lock_files | bool | false   |
 +------------+------+---------+
 
-``lock_files`` determines whether or not to lock files which libtorrent is downloading
-to or seeding from. This is implemented using ``fcntl(F_SETLK)`` on unix systems and
-by not passing in ``SHARE_READ`` and ``SHARE_WRITE`` on windows. This might prevent
-3rd party processes from corrupting the files under libtorrent's feet.
+``lock_files`` determines whether or not to lock files which
+libtorrent is downloading to or seeding from. This is implemented
+using ``fcntl(F_SETLK)`` on unix systems and by not passing in
+``SHARE_READ`` and ``SHARE_WRITE`` on windows. This might prevent
+3rd party processes from corrupting the files under libtorrent's
+feet.
 
 .. _contiguous_recv_buffer:
 
@@ -1009,14 +1041,17 @@ by not passing in ``SHARE_READ`` and ``SHARE_WRITE`` on windows. This might prev
 | contiguous_recv_buffer | bool | true    |
 +------------------------+------+---------+
 
-``contiguous_recv_buffer`` determines whether or not libtorrent should receive
-data from peers into a contiguous intermediate buffer, to then copy blocks into
-disk buffers from, or to make many smaller calls to ``read()``, each time passing
-in the specific buffer the data belongs in. When downloading at high rates, the latter
-may save some time copying data. When seeding at high rates, all incoming traffic
-consists of a very large number of tiny packets, and enabling ``contiguous_recv_buffer``
-will provide higher performance. When this is enabled, it will only be used when
-seeding to peers, since that's when it provides performance improvements.
+``contiguous_recv_buffer`` determines whether or not libtorrent
+should receive data from peers into a contiguous intermediate
+buffer, to then copy blocks into disk buffers from, or to make many
+smaller calls to ``read()``, each time passing in the specific
+buffer the data belongs in. When downloading at high rates, the
+latter may save some time copying data. When seeding at high rates,
+all incoming traffic consists of a very large number of tiny
+packets, and enabling ``contiguous_recv_buffer`` will provide
+higher performance. When this is enabled, it will only be used when
+seeding to peers, since that's when it provides performance
+improvements.
 
 .. _ban_web_seeds:
 
@@ -1044,10 +1079,10 @@ when true, web seeds sending bad data will be banned
 | allow_partial_disk_writes | bool | true    |
 +---------------------------+------+---------+
 
-when set to false, the ``write_cache_line_size`` will apply across piece boundaries.
-this is a bad idea unless the piece picker also is configured to have an affinity
-to pick pieces belonging to the same write cache line as is configured in the
-disk cache.
+when set to false, the ``write_cache_line_size`` will apply across
+piece boundaries. this is a bad idea unless the piece picker also
+is configured to have an affinity to pick pieces belonging to the
+same write cache line as is configured in the disk cache.
 
 .. _force_proxy:
 
@@ -1062,12 +1097,13 @@ disk cache.
 +-------------+------+---------+
 
 If true, disables any communication that's not going over a proxy.
-Enabling this requires a proxy to be configured as well, see ``set_proxy_settings``.
-The listen sockets are closed, and incoming connections will
-only be accepted through a SOCKS5 or I2P proxy (if a peer proxy is set up and
-is run on the same machine as the tracker proxy). This setting also
-disabled peer country lookups, since those are done via DNS lookups that
-aren't supported by proxies.
+Enabling this requires a proxy to be configured as well, see
+``set_proxy_settings``. The listen sockets are closed, and incoming
+connections will only be accepted through a SOCKS5 or I2P proxy (if
+a peer proxy is set up and is run on the same machine as the
+tracker proxy). This setting also disabled peer country lookups,
+since those are done via DNS lookups that aren't supported by
+proxies.
 
 .. _support_share_mode:
 
@@ -1095,8 +1131,8 @@ if false, prevents libtorrent to advertise share-mode support
 | support_merkle_torrents | bool | true    |
 +-------------------------+------+---------+
 
-if this is false, don't advertise support for
-the Tribler merkle tree piece message
+if this is false, don't advertise support for the Tribler merkle
+tree piece message
 
 .. _report_redundant_bytes:
 
@@ -1110,8 +1146,8 @@ the Tribler merkle tree piece message
 | report_redundant_bytes | bool | true    |
 +------------------------+------+---------+
 
-if this is true, the number of redundant bytes
-is sent to the tracker
+if this is true, the number of redundant bytes is sent to the
+tracker
 
 .. _listen_system_port_fallback:
 
@@ -1125,9 +1161,9 @@ is sent to the tracker
 | listen_system_port_fallback | bool | true    |
 +-----------------------------+------+---------+
 
-if this is true, libtorrent will fall back to listening on a port chosen
-by the operating system (i.e. binding to port 0). If a failure is preferred,
-set this to false.
+if this is true, libtorrent will fall back to listening on a port
+chosen by the operating system (i.e. binding to port 0). If a
+failure is preferred, set this to false.
 
 .. _use_disk_cache_pool:
 
@@ -1141,10 +1177,10 @@ set this to false.
 | use_disk_cache_pool | bool | false   |
 +---------------------+------+---------+
 
-``use_disk_cache_pool`` enables using a pool allocator for disk cache blocks.
-Enabling it makes the cache perform better at high throughput.
-It also makes the cache less likely and slower at returning memory back to the system,
-once allocated.
+``use_disk_cache_pool`` enables using a pool allocator for disk
+cache blocks. Enabling it makes the cache perform better at high
+throughput. It also makes the cache less likely and slower at
+returning memory back to the system, once allocated.
 
 .. _announce_crypto_support:
 
@@ -1158,8 +1194,8 @@ once allocated.
 | announce_crypto_support | bool | true    |
 +-------------------------+------+---------+
 
-when this is true, and incoming encrypted connections are enabled, &supportcrypt=1
-is included in http tracker announces
+when this is true, and incoming encrypted connections are enabled,
+&supportcrypt=1 is included in http tracker announces
 
 .. _enable_upnp:
 
@@ -1173,13 +1209,14 @@ is included in http tracker announces
 | enable_upnp | bool | true    |
 +-------------+------+---------+
 
-Starts and stops the UPnP service. When started, the listen port and the DHT
-port are attempted to be forwarded on local UPnP router devices.
+Starts and stops the UPnP service. When started, the listen port
+and the DHT port are attempted to be forwarded on local UPnP router
+devices.
 
-The upnp object returned by ``start_upnp()`` can be used to add and remove
-arbitrary port mappings. Mapping status is returned through the
-portmap_alert and the portmap_error_alert. The object will be valid until
-``stop_upnp()`` is called. See upnp-and-nat-pmp_.
+The upnp object returned by ``start_upnp()`` can be used to add and
+remove arbitrary port mappings. Mapping status is returned through
+the portmap_alert and the portmap_error_alert. The object will be
+valid until ``stop_upnp()`` is called. See upnp-and-nat-pmp_.
 
 .. _enable_natpmp:
 
@@ -1193,13 +1230,15 @@ portmap_alert and the portmap_error_alert. The object will be valid until
 | enable_natpmp | bool | true    |
 +---------------+------+---------+
 
-Starts and stops the NAT-PMP service. When started, the listen port and the DHT
-port are attempted to be forwarded on the router through NAT-PMP.
+Starts and stops the NAT-PMP service. When started, the listen port
+and the DHT port are attempted to be forwarded on the router
+through NAT-PMP.
 
-The natpmp object returned by ``start_natpmp()`` can be used to add and remove
-arbitrary port mappings. Mapping status is returned through the
-portmap_alert and the portmap_error_alert. The object will be valid until
-``stop_natpmp()`` is called. See upnp-and-nat-pmp_.
+The natpmp object returned by ``start_natpmp()`` can be used to add
+and remove arbitrary port mappings. Mapping status is returned
+through the portmap_alert and the portmap_error_alert. The object
+will be valid until ``stop_natpmp()`` is called. See
+upnp-and-nat-pmp_.
 
 .. _enable_lsd:
 
@@ -1213,9 +1252,10 @@ portmap_alert and the portmap_error_alert. The object will be valid until
 | enable_lsd | bool | true    |
 +------------+------+---------+
 
-Starts and stops Local Service Discovery. This service will broadcast
-the infohashes of all the non-private torrents on the local network to
-look for peers on the same swarm within multicast reach.
+Starts and stops Local Service Discovery. This service will
+broadcast the infohashes of all the non-private torrents on the
+local network to look for peers on the same swarm within multicast
+reach.
 
 .. _enable_dht:
 
@@ -1229,8 +1269,8 @@ look for peers on the same swarm within multicast reach.
 | enable_dht | bool | true    |
 +------------+------+---------+
 
-starts the dht node and makes the trackerless service
-available to torrents.
+starts the dht node and makes the trackerless service available to
+torrents.
 
 .. _prefer_rc4:
 
@@ -1244,9 +1284,8 @@ available to torrents.
 | prefer_rc4 | bool | false   |
 +------------+------+---------+
 
-if the allowed encryption level is both, setting this to
-true will prefer rc4 if both methods are offered, plaintext
-otherwise
+if the allowed encryption level is both, setting this to true will
+prefer rc4 if both methods are offered, plaintext otherwise
 
 .. _proxy_hostnames:
 
@@ -1290,10 +1329,10 @@ configured proxy, if any.
 | auto_sequential | bool | true    |
 +-----------------+------+---------+
 
-if this setting is true, torrents with a very high availability
-of pieces (and seeds) are downloaded sequentially. This is more
-efficient for the disk I/O. With many seeds, the download order
-is unlikely to matter anyway
+if this setting is true, torrents with a very high availability of
+pieces (and seeds) are downloaded sequentially. This is more
+efficient for the disk I/O. With many seeds, the download order is
+unlikely to matter anyway
 
 .. _tracker_completion_timeout:
 
@@ -1304,12 +1343,13 @@ is unlikely to matter anyway
 +----------------------------+------+---------+
 | name                       | type | default |
 +============================+======+=========+
-| tracker_completion_timeout | int  | 60      |
+| tracker_completion_timeout | int  | 30      |
 +----------------------------+------+---------+
 
 ``tracker_completion_timeout`` is the number of seconds the tracker
-connection will wait from when it sent the request until it considers the
-tracker to have timed-out. Default value is 60 seconds.
+connection will wait from when it sent the request until it
+considers the tracker to have timed-out. Default value is 60
+seconds.
 
 .. _tracker_receive_timeout:
 
@@ -1320,13 +1360,14 @@ tracker to have timed-out. Default value is 60 seconds.
 +-------------------------+------+---------+
 | name                    | type | default |
 +=========================+======+=========+
-| tracker_receive_timeout | int  | 40      |
+| tracker_receive_timeout | int  | 10      |
 +-------------------------+------+---------+
 
-``tracker_receive_timeout`` is the number of seconds to wait to receive
-any data from the tracker. If no data is received for this number of
-seconds, the tracker will be considered as having timed out. If a tracker
-is down, this is the kind of timeout that will occur.
+``tracker_receive_timeout`` is the number of seconds to wait to
+receive any data from the tracker. If no data is received for this
+number of seconds, the tracker will be considered as having timed
+out. If a tracker is down, this is the kind of timeout that will
+occur.
 
 .. _stop_tracker_timeout:
 
@@ -1340,10 +1381,9 @@ is down, this is the kind of timeout that will occur.
 | stop_tracker_timeout | int  | 5       |
 +----------------------+------+---------+
 
-the time to wait when sending a stopped message
-before considering a tracker to have timed out.
-this is usually shorter, to make the client quit
-faster
+the time to wait when sending a stopped message before considering
+a tracker to have timed out. this is usually shorter, to make the
+client quit faster
 
 .. _tracker_maximum_response_length:
 
@@ -1357,15 +1397,13 @@ faster
 | tracker_maximum_response_length | int  | 1024*1024 |
 +---------------------------------+------+-----------+
 
-this is the maximum number of bytes in a tracker
-response. If a response size passes this number
-of bytes it will be rejected and the connection
-will be closed. On gzipped responses this size is
-measured on the uncompressed data. So, if you get
-20 bytes of gzip response that'll expand to 2 megabytes,
-it will be interrupted before the entire response
-has been uncompressed (assuming the limit is lower
-than 2 megs).
+this is the maximum number of bytes in a tracker response. If a
+response size passes this number of bytes it will be rejected and
+the connection will be closed. On gzipped responses this size is
+measured on the uncompressed data. So, if you get 20 bytes of gzip
+response that'll expand to 2 megabytes, it will be interrupted
+before the entire response has been uncompressed (assuming the
+limit is lower than 2 megs).
 
 .. _piece_timeout:
 
@@ -1379,8 +1417,8 @@ than 2 megs).
 | piece_timeout | int  | 20      |
 +---------------+------+---------+
 
-the number of seconds from a request is sent until
-it times out if no piece response is returned.
+the number of seconds from a request is sent until it times out if
+no piece response is returned.
 
 .. _request_timeout:
 
@@ -1394,9 +1432,8 @@ it times out if no piece response is returned.
 | request_timeout | int  | 60      |
 +-----------------+------+---------+
 
-the number of seconds one block (16kB) is expected
-to be received within. If it's not, the block is
-requested from a different peer
+the number of seconds one block (16kB) is expected to be received
+within. If it's not, the block is requested from a different peer
 
 .. _request_queue_time:
 
@@ -1410,10 +1447,10 @@ requested from a different peer
 | request_queue_time | int  | 3       |
 +--------------------+------+---------+
 
-the length of the request queue given in the number
-of seconds it should take for the other end to send
-all the pieces. i.e. the actual number of requests
-depends on the download rate and this number.
+the length of the request queue given in the number of seconds it
+should take for the other end to send all the pieces. i.e. the
+actual number of requests depends on the download rate and this
+number.
 
 .. _max_allowed_in_request_queue:
 
@@ -1427,12 +1464,11 @@ depends on the download rate and this number.
 | max_allowed_in_request_queue | int  | 500     |
 +------------------------------+------+---------+
 
-the number of outstanding block requests a peer is
-allowed to queue up in the client. If a peer sends
-more requests than this (before the first one has
-been sent) the last request will be dropped.
-the higher this is, the faster upload speeds the
-client can get to a single peer.
+the number of outstanding block requests a peer is allowed to queue
+up in the client. If a peer sends more requests than this (before
+the first one has been sent) the last request will be dropped. the
+higher this is, the faster upload speeds the client can get to a
+single peer.
 
 .. _max_out_request_queue:
 
@@ -1446,10 +1482,10 @@ client can get to a single peer.
 | max_out_request_queue | int  | 500     |
 +-----------------------+------+---------+
 
-``max_out_request_queue`` is the maximum number of outstanding requests to
-send to a peer. This limit takes precedence over ``request_queue_time``. i.e.
-no matter the download speed, the number of outstanding requests will never
-exceed this limit.
+``max_out_request_queue`` is the maximum number of outstanding
+requests to send to a peer. This limit takes precedence over
+``request_queue_time``. i.e. no matter the download speed, the
+number of outstanding requests will never exceed this limit.
 
 .. _whole_pieces_threshold:
 
@@ -1463,12 +1499,11 @@ exceed this limit.
 | whole_pieces_threshold | int  | 20      |
 +------------------------+------+---------+
 
-if a whole piece can be downloaded in this number
-of seconds, or less, the peer_connection will prefer
-to request whole pieces at a time from this peer.
-The benefit of this is to better utilize disk caches by
-doing localized accesses and also to make it easier
-to identify bad peers if a piece fails the hash check.
+if a whole piece can be downloaded in this number of seconds, or
+less, the peer_connection will prefer to request whole pieces at a
+time from this peer. The benefit of this is to better utilize disk
+caches by doing localized accesses and also to make it easier to
+identify bad peers if a piece fails the hash check.
 
 .. _peer_timeout:
 
@@ -1482,11 +1517,11 @@ to identify bad peers if a piece fails the hash check.
 | peer_timeout | int  | 120     |
 +--------------+------+---------+
 
-``peer_timeout`` is the number of seconds the peer connection should
-wait (for any activity on the peer connection) before closing it due
-to time out. This defaults to 120 seconds, since that's what's specified
-in the protocol specification. After half the time out, a keep alive message
-is sent.
+``peer_timeout`` is the number of seconds the peer connection
+should wait (for any activity on the peer connection) before
+closing it due to time out. This defaults to 120 seconds, since
+that's what's specified in the protocol specification. After half
+the time out, a keep alive message is sent.
 
 .. _urlseed_timeout:
 
@@ -1500,9 +1535,9 @@ is sent.
 | urlseed_timeout | int  | 20      |
 +-----------------+------+---------+
 
-same as peer_timeout, but only applies to url-seeds.
-this is usually set lower, because web servers are
-expected to be more reliable.
+same as peer_timeout, but only applies to url-seeds. this is
+usually set lower, because web servers are expected to be more
+reliable.
 
 .. _urlseed_pipeline_size:
 
@@ -1516,10 +1551,10 @@ expected to be more reliable.
 | urlseed_pipeline_size | int  | 5       |
 +-----------------------+------+---------+
 
-controls the pipelining size of url-seeds. i.e. the number
-of HTTP request to keep outstanding before waiting for
-the first one to complete. It's common for web servers
-to limit this to a relatively low number, like 5
+controls the pipelining size of url-seeds. i.e. the number of HTTP
+request to keep outstanding before waiting for the first one to
+complete. It's common for web servers to limit this to a relatively
+low number, like 5
 
 .. _urlseed_wait_retry:
 
@@ -1547,18 +1582,15 @@ time to wait until a new retry of a web seed takes place
 | file_pool_size | int  | 40      |
 +----------------+------+---------+
 
-sets the upper limit on the total number of files this
-session will keep open. The reason why files are
-left open at all is that some anti virus software
-hooks on every file close, and scans the file for
-viruses. deferring the closing of the files will
-be the difference between a usable system and
-a completely hogged down system. Most operating
-systems also has a limit on the total number of
-file descriptors a process may have open. It is
-usually a good idea to find this limit and set the
-number of connections and the number of files
-limits so their sum is slightly below it.
+sets the upper limit on the total number of files this session will
+keep open. The reason why files are left open at all is that some
+anti virus software hooks on every file close, and scans the file
+for viruses. deferring the closing of the files will be the
+difference between a usable system and a completely hogged down
+system. Most operating systems also has a limit on the total number
+of file descriptors a process may have open. It is usually a good
+idea to find this limit and set the number of connections and the
+number of files limits so their sum is slightly below it.
 
 .. _max_failcount:
 
@@ -1572,10 +1604,10 @@ limits so their sum is slightly below it.
 | max_failcount | int  | 3       |
 +---------------+------+---------+
 
-``max_failcount`` is the maximum times we try to connect to a peer before
-stop connecting again. If a peer succeeds, the failcounter is reset. If
-a peer is retrieved from a peer source (other than DHT) the failcount is
-decremented by one, allowing another try.
+``max_failcount`` is the maximum times we try to connect to a peer
+before stop connecting again. If a peer succeeds, the failcounter
+is reset. If a peer is retrieved from a peer source (other than
+DHT) the failcount is decremented by one, allowing another try.
 
 .. _min_reconnect_time:
 
@@ -1589,8 +1621,8 @@ decremented by one, allowing another try.
 | min_reconnect_time | int  | 60      |
 +--------------------+------+---------+
 
-the number of seconds to wait to reconnect to a peer.
-this time is multiplied with the failcount.
+the number of seconds to wait to reconnect to a peer. this time is
+multiplied with the failcount.
 
 .. _peer_connect_timeout:
 
@@ -1604,10 +1636,10 @@ this time is multiplied with the failcount.
 | peer_connect_timeout | int  | 15      |
 +----------------------+------+---------+
 
-``peer_connect_timeout`` the number of seconds to wait after a connection
-attempt is initiated to a peer until it is considered as having timed out.
-This setting is especially important in case the number of half-open
-connections are limited, since stale half-open
+``peer_connect_timeout`` the number of seconds to wait after a
+connection attempt is initiated to a peer until it is considered as
+having timed out. This setting is especially important in case the
+number of half-open connections are limited, since stale half-open
 connection may delay the connection of other peers considerably.
 
 .. _connection_speed:
@@ -1622,8 +1654,8 @@ connection may delay the connection of other peers considerably.
 | connection_speed | int  | 6       |
 +------------------+------+---------+
 
-``connection_speed`` is the number of connection attempts that
-are made per second. If a number < 0 is specified, it will default to
+``connection_speed`` is the number of connection attempts that are
+made per second. If a number < 0 is specified, it will default to
 200 connections per second. If 0 is specified, it means don't make
 outgoing connections at all.
 
@@ -1639,9 +1671,8 @@ outgoing connections at all.
 | inactivity_timeout | int  | 600     |
 +--------------------+------+---------+
 
-if a peer is uninteresting and uninterested for longer
-than this number of seconds, it will be disconnected.
-default is 10 minutes
+if a peer is uninteresting and uninterested for longer than this
+number of seconds, it will be disconnected. default is 10 minutes
 
 .. _unchoke_interval:
 
@@ -1655,10 +1686,11 @@ default is 10 minutes
 | unchoke_interval | int  | 15      |
 +------------------+------+---------+
 
-``unchoke_interval`` is the number of seconds between chokes/unchokes.
-On this interval, peers are re-evaluated for being choked/unchoked. This
-is defined as 30 seconds in the protocol, and it should be significantly
-longer than what it takes for TCP to ramp up to it's max rate.
+``unchoke_interval`` is the number of seconds between
+chokes/unchokes. On this interval, peers are re-evaluated for being
+choked/unchoked. This is defined as 30 seconds in the protocol, and
+it should be significantly longer than what it takes for TCP to
+ramp up to it's max rate.
 
 .. _optimistic_unchoke_interval:
 
@@ -1673,8 +1705,8 @@ longer than what it takes for TCP to ramp up to it's max rate.
 +-----------------------------+------+---------+
 
 ``optimistic_unchoke_interval`` is the number of seconds between
-each *optimistic* unchoke. On this timer, the currently optimistically
-unchoked peer will change.
+each *optimistic* unchoke. On this timer, the currently
+optimistically unchoked peer will change.
 
 .. _num_want:
 
@@ -1688,8 +1720,9 @@ unchoked peer will change.
 | num_want | int  | 200     |
 +----------+------+---------+
 
-``num_want`` is the number of peers we want from each tracker request. It defines
-what is sent as the ``&num_want=`` parameter to the tracker.
+``num_want`` is the number of peers we want from each tracker
+request. It defines what is sent as the ``&num_want=`` parameter to
+the tracker.
 
 .. _initial_picker_threshold:
 
@@ -1703,10 +1736,10 @@ what is sent as the ``&num_want=`` parameter to the tracker.
 | initial_picker_threshold | int  | 4       |
 +--------------------------+------+---------+
 
-``initial_picker_threshold`` specifies the number of pieces we need before we
-switch to rarest first picking. This defaults to 4, which means the 4 first
-pieces in any torrent are picked at random, the following pieces are picked
-in rarest first order.
+``initial_picker_threshold`` specifies the number of pieces we need
+before we switch to rarest first picking. This defaults to 4, which
+means the 4 first pieces in any torrent are picked at random, the
+following pieces are picked in rarest first order.
 
 .. _allowed_fast_set_size:
 
@@ -1720,8 +1753,8 @@ in rarest first order.
 | allowed_fast_set_size | int  | 10      |
 +-----------------------+------+---------+
 
-the number of allowed pieces to send to peers
-that supports the fast extensions
+the number of allowed pieces to send to peers that supports the
+fast extensions
 
 .. _suggest_mode:
 
@@ -1735,14 +1768,14 @@ that supports the fast extensions
 | suggest_mode | int  | settings_pack::no_piece_suggestions |
 +--------------+------+-------------------------------------+
 
-``suggest_mode`` controls whether or not libtorrent will send out suggest
-messages to create a bias of its peers to request certain pieces. The modes
-are:
+``suggest_mode`` controls whether or not libtorrent will send out
+suggest messages to create a bias of its peers to request certain
+pieces. The modes are:
 
-* ``no_piece_suggestsions`` which is the default and will not send out suggest
-  messages.
-* ``suggest_read_cache`` which will send out suggest messages for the most
-  recent pieces that are in the read cache.
+* ``no_piece_suggestsions`` which is the default and will not send
+  out suggest messages.
+* ``suggest_read_cache`` which will send out suggest messages for
+  the most recent pieces that are in the read cache.
 
 .. _max_queued_disk_bytes:
 
@@ -1756,12 +1789,13 @@ are:
 | max_queued_disk_bytes | int  | 1024 * 1024 |
 +-----------------------+------+-------------+
 
-``max_queued_disk_bytes`` is the number maximum number of bytes, to be
-written to disk, that can wait in the disk I/O thread queue. This queue
-is only for waiting for the disk I/O thread to receive the job and either
-write it to disk or insert it in the write cache. When this limit is reached,
-the peer connections will stop reading data from their sockets, until the disk
-thread catches up. Setting this too low will severly limit your download rate.
+``max_queued_disk_bytes`` is the number maximum number of bytes, to
+be written to disk, that can wait in the disk I/O thread queue.
+This queue is only for waiting for the disk I/O thread to receive
+the job and either write it to disk or insert it in the write
+cache. When this limit is reached, the peer connections will stop
+reading data from their sockets, until the disk thread catches up.
+Setting this too low will severly limit your download rate.
 
 .. _handshake_timeout:
 
@@ -1775,9 +1809,9 @@ thread catches up. Setting this too low will severly limit your download rate.
 | handshake_timeout | int  | 10      |
 +-------------------+------+---------+
 
-the number of seconds to wait for a handshake
-response from a peer. If no response is received
-within this time, the peer is disconnected.
+the number of seconds to wait for a handshake response from a peer.
+If no response is received within this time, the peer is
+disconnected.
 
 .. _send_buffer_low_watermark:
 
@@ -1801,29 +1835,26 @@ within this time, the peer is disconnected.
 | send_buffer_watermark_factor | int  | 50         |
 +------------------------------+------+------------+
 
-``send_buffer_low_watermark`` the minimum send buffer target
-size (send buffer includes bytes pending being read from disk).
-For good and snappy seeding performance, set this fairly high, to
-at least fit a few blocks. This is essentially the initial
-window size which will determine how fast we can ramp up
-the send rate
+``send_buffer_low_watermark`` the minimum send buffer target size
+(send buffer includes bytes pending being read from disk). For good
+and snappy seeding performance, set this fairly high, to at least
+fit a few blocks. This is essentially the initial window size which
+will determine how fast we can ramp up the send rate
 
 if the send buffer has fewer bytes than ``send_buffer_watermark``,
-we'll read another 16kB block onto it. If set too small,
-upload rate capacity will suffer. If set too high,
-memory will be wasted.
-The actual watermark may be lower than this in case
-the upload rate is low, this is the upper limit.
+we'll read another 16kB block onto it. If set too small, upload
+rate capacity will suffer. If set too high, memory will be wasted.
+The actual watermark may be lower than this in case the upload rate
+is low, this is the upper limit.
 
-the current upload rate to a peer is multiplied by
-this factor to get the send buffer watermark. The
-factor is specified as a percentage. i.e. 50 -> 0.5
-This product is clamped to the ``send_buffer_watermark``
-setting to not exceed the max. For high speed
-upload, this should be set to a greater value than
-100. For high capacity connections, setting this
-higher can improve upload performance and disk throughput. Setting it too
-high may waste RAM and create a bias towards read jobs over write jobs.
+the current upload rate to a peer is multiplied by this factor to
+get the send buffer watermark. The factor is specified as a
+percentage. i.e. 50 -> 0.5 This product is clamped to the
+``send_buffer_watermark`` setting to not exceed the max. For high
+speed upload, this should be set to a greater value than 100. For
+high capacity connections, setting this higher can improve upload
+performance and disk throughput. Setting it too high may waste RAM
+and create a bias towards read jobs over write jobs.
 
 .. _choking_algorithm:
 
@@ -1842,41 +1873,46 @@ high may waste RAM and create a bias towards read jobs over write jobs.
 | seed_choking_algorithm | int  | settings_pack::round_robin        |
 +------------------------+------+-----------------------------------+
 
-``choking_algorithm`` specifies which algorithm to use to determine which peers
-to unchoke.
+``choking_algorithm`` specifies which algorithm to use to determine
+which peers to unchoke.
 
 The options for choking algorithms are:
 
-* ``fixed_slots_choker`` is the traditional choker with a fixed number of unchoke
-  slots (as specified by ``session::set_max_uploads()``).
+* ``fixed_slots_choker`` is the traditional choker with a fixed
+  number of unchoke slots (as specified by
+  ``session::set_max_uploads()``).
 
-* ``rate_based_choker`` opens up unchoke slots based on the upload rate
-  achieved to peers. The more slots that are opened, the marginal upload
-  rate required to open up another slot increases.
+* ``rate_based_choker`` opens up unchoke slots based on the upload
+  rate achieved to peers. The more slots that are opened, the
+  marginal upload rate required to open up another slot increases.
 
-* ``bittyrant_choker`` attempts to optimize download rate by finding the
-  reciprocation rate of each peer individually and prefers peers that gives
-  the highest *return on investment*. It still allocates all upload capacity,
-  but shuffles it around to the best peers first. For this choker to be
-  efficient, you need to set a global upload rate limit
-  (``session::set_upload_rate_limit()``). For more information about this
-  choker, see the paper_. This choker is not fully implemented nor tested.
+* ``bittyrant_choker`` attempts to optimize download rate by
+  finding the reciprocation rate of each peer individually and
+  prefers peers that gives the highest *return on investment*. It
+  still allocates all upload capacity, but shuffles it around to
+  the best peers first. For this choker to be efficient, you need
+  to set a global upload rate limit
+  (``session::set_upload_rate_limit()``). For more information
+  about this choker, see the paper_. This choker is not fully
+  implemented nor tested.
 
 .. _paper: http://bittyrant.cs.washington.edu/#papers
 
-``seed_choking_algorithm`` controls the seeding unchoke behavior. The available
-options are:
+``seed_choking_algorithm`` controls the seeding unchoke behavior.
+The available options are:
 
-* ``round_robin`` which round-robins the peers that are unchoked when seeding. This
-  distributes the upload bandwidht uniformly and fairly. It minimizes the ability
-  for a peer to download everything without redistributing it.
+* ``round_robin`` which round-robins the peers that are unchoked
+  when seeding. This distributes the upload bandwidht uniformly and
+  fairly. It minimizes the ability for a peer to download everything
+  without redistributing it.
 
-* ``fastest_upload`` unchokes the peers we can send to the fastest. This might be
-  a bit more reliable in utilizing all available capacity.
+* ``fastest_upload`` unchokes the peers we can send to the fastest.
+  This might be a bit more reliable in utilizing all available
+  capacity.
 
-* ``anti_leech`` prioritizes peers who have just started or are just about to finish
-  the download. The intention is to force peers in the middle of the download to
-  trade with each other.
+* ``anti_leech`` prioritizes peers who have just started or are
+  just about to finish the download. The intention is to force
+  peers in the middle of the download to trade with each other.
 
 .. _cache_size:
 
@@ -1938,8 +1974,7 @@ refresh. Refreshing a torrent's explicit read cache means scanning
 all pieces and picking a random set of the rarest ones. There is an
 affinity to pick pieces that are already in the cache, so that
 subsequent refreshes only swaps in pieces that are rarer than
-whatever is in
-the cache at the time.
+whatever is in the cache at the time.
 
 .. _disk_io_write_mode:
 
@@ -1958,19 +1993,19 @@ the cache at the time.
 | disk_io_read_mode  | int  | settings_pack::enable_os_cache |
 +--------------------+------+--------------------------------+
 
-determines how files are opened when they're in read only mode versus
-read and write mode. The options are:
+determines how files are opened when they're in read only mode
+versus read and write mode. The options are:
 
-* enable_os_cache
-   This is the default and files are opened normally, with the OS caching
-   reads and writes.
-* disable_os_cache
-   This opens all files in no-cache mode. This corresponds to the
-   OS not letting blocks for the files linger in the cache. This
-   makes sense in order to avoid the bittorrent client to
-   potentially evict all other processes' cache by simply handling
-   high throughput and large files. If libtorrent's read cache is
-   disabled, enabling this may reduce performance.
+enable_os_cache
+  This is the default and files are opened normally, with the OS
+  caching reads and writes.
+disable_os_cache
+  This opens all files in no-cache mode. This corresponds to the
+  OS not letting blocks for the files linger in the cache. This
+  makes sense in order to avoid the bittorrent client to
+  potentially evict all other processes' cache by simply handling
+  high throughput and large files. If libtorrent's read cache is
+  disabled, enabling this may reduce performance.
 
 One reason to disable caching is that it may help the operating
 system from growing its file cache indefinitely. Since some OSes
@@ -1996,19 +2031,17 @@ boundries.
 | num_outgoing_ports | int  | 0       |
 +--------------------+------+---------+
 
-this is the first port to use for binding
-outgoing connections to. This is useful
-for users that have routers that
-allow QoS settings based on local port.
-when binding outgoing connections to specific
-ports, ``num_outgoing_ports`` is the size of
-the range. It should be more than a few
+this is the first port to use for binding outgoing connections to.
+This is useful for users that have routers that allow QoS settings
+based on local port. when binding outgoing connections to specific
+ports, ``num_outgoing_ports`` is the size of the range. It should
+be more than a few
 
-.. warning:: setting outgoing ports will limit the ability to keep multiple
-   connections to the same client, even for different torrents. It is not
-   recommended to change this setting. Its main purpose is to use as an
-   escape hatch for cheap routers with QoS capability but can only classify
-   flows based on port numbers.
+.. warning:: setting outgoing ports will limit the ability to keep
+   multiple connections to the same client, even for different
+   torrents. It is not recommended to change this setting. Its main
+   purpose is to use as an escape hatch for cheap routers with QoS
+   capability but can only classify flows based on port numbers.
 
 It is a range instead of a single port because of the problems with
 failing to reconnect to peers if a previous socket to that peer and
@@ -2026,10 +2059,11 @@ port is in ``TIME_WAIT`` state.
 | peer_tos | int  | 0       |
 +----------+------+---------+
 
-``peer_tos`` determines the TOS byte set in the IP header of every packet
-sent to peers (including web seeds). The default value for this is ``0x0``
-(no marking). One potentially useful TOS mark is ``0x20``, this represents
-the *QBone scavenger service*. For more details, see QBSS_.
+``peer_tos`` determines the TOS byte set in the IP header of every
+packet sent to peers (including web seeds). The default value for
+this is ``0x0`` (no marking). One potentially useful TOS mark is
+``0x20``, this represents the *QBone scavenger service*. For more
+details, see QBSS_.
 
 .. _`QBSS`: http://qbone.internet2.edu/qbss/
 
@@ -2075,48 +2109,54 @@ the *QBone scavenger service*. For more details, see QBSS_.
 | active_loaded_limit  | int  | 100     |
 +----------------------+------+---------+
 
-for auto managed torrents, these are the limits
-they are subject to. If there are too many torrents
-some of the auto managed ones will be paused until
-some slots free up.
-``active_downloads`` and ``active_seeds`` controls how many active seeding and
-downloading torrents the queuing mechanism allows. The target number of active
+for auto managed torrents, these are the limits they are subject
+to. If there are too many torrents some of the auto managed ones
+will be paused until some slots free up. ``active_downloads`` and
+``active_seeds`` controls how many active seeding and downloading
+torrents the queuing mechanism allows. The target number of active
 torrents is ``min(active_downloads + active_seeds, active_limit)``.
-``active_downloads`` and ``active_seeds`` are upper limits on the number of
-downloading torrents and seeding torrents respectively. Setting the value to
--1 means unlimited.
+``active_downloads`` and ``active_seeds`` are upper limits on the
+number of downloading torrents and seeding torrents respectively.
+Setting the value to -1 means unlimited.
 
-For example if there are 10 seeding torrents and 10 downloading torrents, and
-``active_downloads`` is 4 and ``active_seeds`` is 4, there will be 4 seeds
-active and 4 downloading torrents. If the settings are ``active_downloads`` = 2
-and ``active_seeds`` = 4, then there will be 2 downloading torrents and 4 seeding
-torrents active. Torrents that are not auto managed are not counted against these
-limits.
+For example if there are 10 seeding torrents and 10 downloading
+torrents, and ``active_downloads`` is 4 and ``active_seeds`` is 4,
+there will be 4 seeds active and 4 downloading torrents. If the
+settings are ``active_downloads`` = 2 and ``active_seeds`` = 4,
+then there will be 2 downloading torrents and 4 seeding torrents
+active. Torrents that are not auto managed are not counted against
+these limits.
 
-``active_limit`` is a hard limit on the number of active torrents. This applies even to
-slow torrents.
+``active_limit`` is a hard limit on the number of active torrents.
+This applies even to slow torrents.
 
-``active_dht_limit`` is the max number of torrents to announce to the DHT. By default
-this is set to 88, which is no more than one DHT announce every 10 seconds.
+``active_dht_limit`` is the max number of torrents to announce to
+the DHT. By default this is set to 88, which is no more than one
+DHT announce every 10 seconds.
 
-``active_tracker_limit`` is the max number of torrents to announce to their trackers.
-By default this is 360, which is no more than one announce every 5 seconds.
+``active_tracker_limit`` is the max number of torrents to announce
+to their trackers. By default this is 360, which is no more than
+one announce every 5 seconds.
 
-``active_lsd_limit`` is the max number of torrents to announce to the local network
-over the local service discovery protocol. By default this is 80, which is no more
-than one announce every 5 seconds (assuming the default announce interval of 5 minutes).
+``active_lsd_limit`` is the max number of torrents to announce to
+the local network over the local service discovery protocol. By
+default this is 80, which is no more than one announce every 5
+seconds (assuming the default announce interval of 5 minutes).
 
-You can have more torrents *active*, even though they are not announced to the DHT,
-lsd or their tracker. If some peer knows about you for any reason and tries to connect,
-it will still be accepted, unless the torrent is paused, which means it won't accept
+You can have more torrents *active*, even though they are not
+announced to the DHT, lsd or their tracker. If some peer knows
+about you for any reason and tries to connect, it will still be
+accepted, unless the torrent is paused, which means it won't accept
 any connections.
 
-``active_loaded_limit`` is the number of torrents that are allowed to be *loaded*
-at any given time. Note that a torrent can be active even though it's not loaded.
-if an unloaded torrents finds a peer that wants to access it, the torrent will be
-loaded on demand, using a user-supplied callback function. If the feature of unloading
-torrents is not enabled, this setting have no effect. If this limit is set to 0, it
-means unlimited. For more information, see dynamic-loading-of-torrent-files_.
+``active_loaded_limit`` is the number of torrents that are allowed
+to be *loaded* at any given time. Note that a torrent can be active
+even though it's not loaded. if an unloaded torrents finds a peer
+that wants to access it, the torrent will be loaded on demand,
+using a user-supplied callback function. If the feature of
+unloading torrents is not enabled, this setting have no effect. If
+this limit is set to 0, it means unlimited. For more information,
+see dynamic-loading-of-torrent-files_.
 
 .. _auto_manage_interval:
 
@@ -2130,8 +2170,8 @@ means unlimited. For more information, see dynamic-loading-of-torrent-files_.
 | auto_manage_interval | int  | 30      |
 +----------------------+------+---------+
 
-``auto_manage_interval`` is the number of seconds between the torrent queue
-is updated, and rotated.
+``auto_manage_interval`` is the number of seconds between the
+torrent queue is updated, and rotated.
 
 .. _seed_time_limit:
 
@@ -2146,8 +2186,8 @@ is updated, and rotated.
 +-----------------+------+--------------+
 
 this is the limit on the time a torrent has been an active seed
-(specified in seconds) before it is considered having met the seed limit criteria.
-See queuing_.
+(specified in seconds) before it is considered having met the seed
+limit criteria. See queuing_.
 
 .. _auto_scrape_interval:
 
@@ -2166,16 +2206,16 @@ See queuing_.
 | auto_scrape_min_interval | int  | 300     |
 +--------------------------+------+---------+
 
-``auto_scrape_interval`` is the number of seconds between scrapes of
-queued torrents (auto managed and paused torrents). Auto managed
+``auto_scrape_interval`` is the number of seconds between scrapes
+of queued torrents (auto managed and paused torrents). Auto managed
 torrents that are paused, are scraped regularly in order to keep
-track of their downloader/seed ratio. This ratio is used to determine
-which torrents to seed and which to pause.
+track of their downloader/seed ratio. This ratio is used to
+determine which torrents to seed and which to pause.
 
-``auto_scrape_min_interval`` is the minimum number of seconds between any
-automatic scrape (regardless of torrent). In case there are a large number
-of paused auto managed torrents, this puts a limit on how often a scrape
-request is sent.
+``auto_scrape_min_interval`` is the minimum number of seconds
+between any automatic scrape (regardless of torrent). In case there
+are a large number of paused auto managed torrents, this puts a
+limit on how often a scrape request is sent.
 
 .. _max_peerlist_size:
 
@@ -2195,17 +2235,18 @@ request is sent.
 +--------------------------+------+---------+
 
 ``max_peerlist_size`` is the maximum number of peers in the list of
-known peers. These peers are not necessarily connected, so this number
-should be much greater than the maximum number of connected peers.
-Peers are evicted from the cache when the list grows passed 90% of
-this limit, and once the size hits the limit, peers are no longer
-added to the list. If this limit is set to 0, there is no limit on
-how many peers we'll keep in the peer list.
+known peers. These peers are not necessarily connected, so this
+number should be much greater than the maximum number of connected
+peers. Peers are evicted from the cache when the list grows passed
+90% of this limit, and once the size hits the limit, peers are no
+longer added to the list. If this limit is set to 0, there is no
+limit on how many peers we'll keep in the peer list.
 
-``max_paused_peerlist_size`` is the max peer list size used for torrents
-that are paused. This default to the same as ``max_peerlist_size``, but
-can be used to save memory for paused torrents, since it's not as
-important for them to keep a large peer list.
+``max_paused_peerlist_size`` is the max peer list size used for
+torrents that are paused. This default to the same as
+``max_peerlist_size``, but can be used to save memory for paused
+torrents, since it's not as important for them to keep a large peer
+list.
 
 .. _min_announce_interval:
 
@@ -2221,7 +2262,8 @@ important for them to keep a large peer list.
 
 this is the minimum allowed announce interval for a tracker. This
 is specified in seconds and is used as a sanity check on what is
-returned from a tracker. It mitigates hammering misconfigured trackers.
+returned from a tracker. It mitigates hammering misconfigured
+trackers.
 
 .. _auto_manage_startup:
 
@@ -2235,9 +2277,9 @@ returned from a tracker. It mitigates hammering misconfigured trackers.
 | auto_manage_startup | int  | 60      |
 +---------------------+------+---------+
 
-this is the number of seconds a torrent is considered
-active after it was started, regardless of upload and download speed. This
-is so that newly started torrents are not considered inactive until they
+this is the number of seconds a torrent is considered active after
+it was started, regardless of upload and download speed. This is so
+that newly started torrents are not considered inactive until they
 have a fair chance to start downloading.
 
 .. _seeding_piece_quota:
@@ -2254,9 +2296,9 @@ have a fair chance to start downloading.
 
 ``seeding_piece_quota`` is the number of pieces to send to a peer,
 when seeding, before rotating in another peer to the unchoke set.
-It defaults to 3 pieces, which means that when seeding, any peer we've
-sent more than this number of pieces to will be unchoked in favour of
-a choked peer.
+It defaults to 3 pieces, which means that when seeding, any peer
+we've sent more than this number of pieces to will be unchoked in
+favour of a choked peer.
 
 .. _max_sparse_regions:
 
@@ -2270,15 +2312,15 @@ a choked peer.
 | max_sparse_regions | int  | 0       |
 +--------------------+------+---------+
 
-``max_sparse_regions`` is a limit of the number of *sparse regions* in
-a torrent. A sparse region is defined as a hole of pieces we have not
-yet downloaded, in between pieces that have been downloaded. This is
-used as a hack for windows vista which has a bug where you cannot
-write files with more than a certain number of sparse regions. This
-limit is not hard, it will be exceeded. Once it's exceeded, pieces
-that will maintain or decrease the number of sparse regions are
-prioritized. To disable this functionality, set this to 0. It defaults
-to 0 on all platforms except windows.
+``max_sparse_regions`` is a limit of the number of *sparse regions*
+in a torrent. A sparse region is defined as a hole of pieces we
+have not yet downloaded, in between pieces that have been
+downloaded. This is used as a hack for windows vista which has a
+bug where you cannot write files with more than a certain number of
+sparse regions. This limit is not hard, it will be exceeded. Once
+it's exceeded, pieces that will maintain or decrease the number of
+sparse regions are prioritized. To disable this functionality, set
+this to 0. It defaults to 0 on all platforms except windows.
 
 .. _max_rejects:
 
@@ -2293,9 +2335,9 @@ to 0 on all platforms except windows.
 +-------------+------+---------+
 
 TODO: 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.
+``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.
 
 .. _recv_socket_buffer_size:
 
@@ -2314,11 +2356,11 @@ disconnected.
 | send_socket_buffer_size | int  | 0       |
 +-------------------------+------+---------+
 
-``recv_socket_buffer_size`` and ``send_socket_buffer_size`` specifies
-the buffer sizes set on peer sockets. 0 (which is the default) means
-the OS default (i.e. don't change the buffer sizes). The socket buffer
-sizes are changed using setsockopt() with SOL_SOCKET/SO_RCVBUF and
-SO_SNDBUFFER.
+``recv_socket_buffer_size`` and ``send_socket_buffer_size``
+specifies the buffer sizes set on peer sockets. 0 (which is the
+default) means the OS default (i.e. don't change the buffer sizes).
+The socket buffer sizes are changed using setsockopt() with
+SOL_SOCKET/SO_RCVBUF and SO_SNDBUFFER.
 
 .. _file_checks_delay_per_block:
 
@@ -2332,12 +2374,13 @@ SO_SNDBUFFER.
 | file_checks_delay_per_block | int  | 0       |
 +-----------------------------+------+---------+
 
-``file_checks_delay_per_block`` is the number of milliseconds to sleep
-in between disk read operations when checking torrents. This defaults
-to 0, but can be set to higher numbers to slow down the rate at which
-data is read from the disk while checking. This may be useful for
-background tasks that doesn't matter if they take a bit longer, as long
-as they leave disk I/O time for other processes.
+``file_checks_delay_per_block`` is the number of milliseconds to
+sleep in between disk read operations when checking torrents. This
+defaults to 0, but can be set to higher numbers to slow down the
+rate at which data is read from the disk while checking. This may
+be useful for background tasks that doesn't matter if they take a
+bit longer, as long as they leave disk I/O time for other
+processes.
 
 .. _read_cache_line_size:
 
@@ -2356,14 +2399,15 @@ as they leave disk I/O time for other processes.
 | write_cache_line_size | int  | 16      |
 +-----------------------+------+---------+
 
-``read_cache_line_size`` is the number of blocks to read into the read
-cache when a read cache miss occurs. Setting this to 0 is essentially
-the same thing as disabling read cache. The number of blocks read
-into the read cache is always capped by the piece boundry.
+``read_cache_line_size`` is the number of blocks to read into the
+read cache when a read cache miss occurs. Setting this to 0 is
+essentially the same thing as disabling read cache. The number of
+blocks read into the read cache is always capped by the piece
+boundry.
 
-When a piece in the write cache has ``write_cache_line_size`` contiguous
-blocks in it, they will be flushed. Setting this to 1 effectively
-disables the write cache.
+When a piece in the write cache has ``write_cache_line_size``
+contiguous blocks in it, they will be flushed. Setting this to 1
+effectively disables the write cache.
 
 .. _optimistic_disk_retry:
 
@@ -2377,11 +2421,12 @@ disables the write cache.
 | optimistic_disk_retry | int  | 10 * 60 |
 +-----------------------+------+---------+
 
-``optimistic_disk_retry`` is the number of seconds from a disk write
-errors occur on a torrent until libtorrent will take it out of the
-upload mode, to test if the error condition has been fixed.
+``optimistic_disk_retry`` is the number of seconds from a disk
+write errors occur on a torrent until libtorrent will take it out
+of the upload mode, to test if the error condition has been fixed.
 
-libtorrent will only do this automatically for auto managed torrents.
+libtorrent will only do this automatically for auto managed
+torrents.
 
 You can explicitly take a torrent out of upload only mode using
 set_upload_mode().
@@ -2398,9 +2443,10 @@ set_upload_mode().
 | max_suggest_pieces | int  | 10      |
 +--------------------+------+---------+
 
-``max_suggest_pieces`` is the max number of suggested piece indices received
-from a peer that's remembered. If a peer floods suggest messages, this limit
-prevents libtorrent from using too much RAM. It defaults to 10.
+``max_suggest_pieces`` is the max number of suggested piece indices
+received from a peer that's remembered. If a peer floods suggest
+messages, this limit prevents libtorrent from using too much RAM.
+It defaults to 10.
 
 .. _local_service_announce_interval:
 
@@ -2431,8 +2477,8 @@ This interval is specified in seconds.
 | dht_announce_interval | int  | 15 * 60 |
 +-----------------------+------+---------+
 
-``dht_announce_interval`` is the number of seconds between announcing
-torrents to the distributed hash table (DHT).
+``dht_announce_interval`` is the number of seconds between
+announcing torrents to the distributed hash table (DHT).
 
 .. _udp_tracker_token_expiry:
 
@@ -2447,11 +2493,11 @@ torrents to the distributed hash table (DHT).
 +--------------------------+------+---------+
 
 ``udp_tracker_token_expiry`` is the number of seconds libtorrent
-will keep UDP tracker connection tokens around for. This is specified
-to be 60 seconds, and defaults to that. The higher this value is, the
-fewer packets have to be sent to the UDP tracker. In order for higher
-values to work, the tracker needs to be configured to match the
-expiration time for tokens.
+will keep UDP tracker connection tokens around for. This is
+specified to be 60 seconds, and defaults to that. The higher this
+value is, the fewer packets have to be sent to the UDP tracker. In
+order for higher values to work, the tracker needs to be configured
+to match the expiration time for tokens.
 
 .. _default_cache_min_age:
 
@@ -2484,12 +2530,12 @@ there is a shortage of spare cache space.
 | num_optimistic_unchoke_slots | int  | 0       |
 +------------------------------+------+---------+
 
-``num_optimistic_unchoke_slots`` is the number of optimistic unchoke
-slots to use. It defaults to 0, which means automatic. Having a higher
-number of optimistic unchoke slots mean you will find the good peers
-faster but with the trade-off to use up more bandwidth. When this is
-set to 0, libtorrent opens up 20% of your allowed upload slots as
-optimistic unchoke slots.
+``num_optimistic_unchoke_slots`` is the number of optimistic
+unchoke slots to use. It defaults to 0, which means automatic.
+Having a higher number of optimistic unchoke slots mean you will
+find the good peers faster but with the trade-off to use up more
+bandwidth. When this is set to 0, libtorrent opens up 20% of your
+allowed upload slots as optimistic unchoke slots.
 
 .. _default_est_reciprocation_rate:
 
@@ -2513,11 +2559,12 @@ optimistic unchoke slots.
 | decrease_est_reciprocation_rate | int  | 3       |
 +---------------------------------+------+---------+
 
-``default_est_reciprocation_rate`` is the assumed reciprocation rate
-from peers when using the BitTyrant choker. This defaults to 14 kiB/s.
-If set too high, you will over-estimate your peers and be more altruistic
-while finding the true reciprocation rate, if it's set too low, you'll
-be too stingy and waste finding the true reciprocation rate.
+``default_est_reciprocation_rate`` is the assumed reciprocation
+rate from peers when using the BitTyrant choker. This defaults to
+14 kiB/s. If set too high, you will over-estimate your peers and be
+more altruistic while finding the true reciprocation rate, if it's
+set too low, you'll be too stingy and waste finding the true
+reciprocation rate.
 
 ``increase_est_reciprocation_rate`` specifies how many percent the
 extimated reciprocation rate should be increased by each unchoke
@@ -2526,8 +2573,8 @@ This only applies to the BitTyrant choker.
 
 ``decrease_est_reciprocation_rate`` specifies how many percent the
 estimated reciprocation rate should be decreased by each unchoke
-interval a peer unchokes us. This default to 3%.
-This only applies to the BitTyrant choker.
+interval a peer unchokes us. This default to 3%. This only applies
+to the BitTyrant choker.
 
 .. _max_pex_peers:
 
@@ -2541,10 +2588,10 @@ This only applies to the BitTyrant choker.
 | max_pex_peers | int  | 50      |
 +---------------+------+---------+
 
-the max number of peers we accept from pex messages from a single peer.
-this limits the number of concurrent peers any of our peers claims to
-be connected to. If they clain to be connected to more than this, we'll
-ignore any peer that exceeds this limit
+the max number of peers we accept from pex messages from a single
+peer. this limits the number of concurrent peers any of our peers
+claims to be connected to. If they clain to be connected to more
+than this, we'll ignore any peer that exceeds this limit
 
 .. _tick_interval:
 
@@ -2558,11 +2605,12 @@ ignore any peer that exceeds this limit
 | tick_interval | int  | 500     |
 +---------------+------+---------+
 
-``tick_interval`` specifies the number of milliseconds between internal
-ticks. This is the frequency with which bandwidth quota is distributed to
-peers. It should not be more than one second (i.e. 1000 ms). Setting this
-to a low value (around 100) means higher resolution bandwidth quota distribution,
-setting it to a higher value saves CPU cycles.
+``tick_interval`` specifies the number of milliseconds between
+internal ticks. This is the frequency with which bandwidth quota is
+distributed to peers. It should not be more than one second (i.e.
+1000 ms). Setting this to a low value (around 100) means higher
+resolution bandwidth quota distribution, setting it to a higher
+value saves CPU cycles.
 
 .. _share_mode_target:
 
@@ -2576,14 +2624,15 @@ setting it to a higher value saves CPU cycles.
 | share_mode_target | int  | 3       |
 +-------------------+------+---------+
 
-``share_mode_target`` specifies the target share ratio for share mode torrents.
-This defaults to 3, meaning we'll try to upload 3 times as much as we download.
-Setting this very high, will make it very conservative and you might end up
-not downloading anything ever (and not affecting your share ratio). It does
-not make any sense to set this any lower than 2. For instance, if only 3 peers
-need to download the rarest piece, it's impossible to download a single piece
-and upload it more than 3 times. If the share_mode_target is set to more than 3,
-nothing is downloaded.
+``share_mode_target`` specifies the target share ratio for share
+mode torrents. This defaults to 3, meaning we'll try to upload 3
+times as much as we download. Setting this very high, will make it
+very conservative and you might end up not downloading anything
+ever (and not affecting your share ratio). It does not make any
+sense to set this any lower than 2. For instance, if only 3 peers
+need to download the rarest piece, it's impossible to download a
+single piece and upload it more than 3 times. If the
+share_mode_target is set to more than 3, nothing is downloaded.
 
 .. _upload_rate_limit:
 
@@ -2602,16 +2651,19 @@ nothing is downloaded.
 | download_rate_limit | int  | 0       |
 +---------------------+------+---------+
 
-``upload_rate_limit``, ``download_rate_limit``, ``local_upload_rate_limit``
-and ``local_download_rate_limit`` sets the session-global limits of upload
-and download rate limits, in bytes per second. The local rates refer to peers
-on the local network. By default peers on the local network are not rate limited.
+``upload_rate_limit``, ``download_rate_limit``,
+``local_upload_rate_limit`` and ``local_download_rate_limit`` sets
+the session-global limits of upload and download rate limits, in
+bytes per second. The local rates refer to peers on the local
+network. By default peers on the local network are not rate
+limited.
 
-These rate limits are only used for local peers (peers within the same subnet as
-the client itself) and it is only used when ``ignore_limits_on_local_network``
-is set to true (which it is by default). These rate limits default to unthrottled,
-but can be useful in case you want to treat local peers preferentially, but not
-quite unthrottled.
+These rate limits are only used for local peers (peers within the
+same subnet as the client itself) and it is only used when
+``ignore_limits_on_local_network`` is set to true (which it is by
+default). These rate limits default to unthrottled, but can be
+useful in case you want to treat local peers preferentially, but
+not quite unthrottled.
 
 A value of 0 means unlimited.
 
@@ -2627,9 +2679,10 @@ A value of 0 means unlimited.
 | dht_upload_rate_limit | int  | 4000    |
 +-----------------------+------+---------+
 
-``dht_upload_rate_limit`` sets the rate limit on the DHT. This is specified in
-bytes per second and defaults to 4000. For busy boxes with lots of torrents
-that requires more DHT traffic, this should be raised.
+``dht_upload_rate_limit`` sets the rate limit on the DHT. This is
+specified in bytes per second and defaults to 4000. For busy boxes
+with lots of torrents that requires more DHT traffic, this should
+be raised.
 
 .. _unchoke_slots_limit:
 
@@ -2643,9 +2696,9 @@ that requires more DHT traffic, this should be raised.
 | unchoke_slots_limit | int  | 8       |
 +---------------------+------+---------+
 
-``unchoke_slots_limit`` is the max number of unchoked peers in the session.
-The number of unchoke slots may be ignored depending on what
-``choking_algorithm`` is set to.
+``unchoke_slots_limit`` is the max number of unchoked peers in the
+session. The number of unchoke slots may be ignored depending on
+what ``choking_algorithm`` is set to.
 
 .. _connections_limit:
 
@@ -2659,10 +2712,11 @@ The number of unchoke slots may be ignored depending on what
 | connections_limit | int  | 200     |
 +-------------------+------+---------+
 
-``connections_limit`` sets a global limit on the number of connections
-opened. The number of connections is set to a hard minimum of at least two per
-torrent, so if you set a too low connections limit, and open too many torrents,
-the limit will not be met.
+``connections_limit`` sets a global limit on the number of
+connections opened. The number of connections is set to a hard
+minimum of at least two per torrent, so if you set a too low
+connections limit, and open too many torrents, the limit will not
+be met.
 
 .. _connections_slack:
 
@@ -2676,8 +2730,9 @@ the limit will not be met.
 | connections_slack | int  | 10      |
 +-------------------+------+---------+
 
-``connections_slack`` is the the number of incoming connections exceeding the
-connection limit to accept in order to potentially replace existing ones.
+``connections_slack`` is the the number of incoming connections
+exceeding the connection limit to accept in order to potentially
+replace existing ones.
 
 .. _utp_target_delay:
 
@@ -2726,31 +2781,37 @@ connection limit to accept in order to potentially replace existing ones.
 | utp_loss_multiplier | int  | 50      |
 +---------------------+------+---------+
 
-``utp_target_delay`` is the target delay for uTP sockets in milliseconds. A high
-value will make uTP connections more aggressive and cause longer queues in the upload
-bottleneck. It cannot be too low, since the noise in the measurements would cause
+``utp_target_delay`` is the target delay for uTP sockets in
+milliseconds. A high value will make uTP connections more
+aggressive and cause longer queues in the upload bottleneck. It
+cannot be too low, since the noise in the measurements would cause
 it to send too slow. The default is 50 milliseconds.
-``utp_gain_factor`` is the number of bytes the uTP congestion window can increase
-at the most in one RTT. This defaults to 300 bytes. If this is set too high,
-the congestion controller reacts too hard to noise and will not be stable, if it's
-set too low, it will react slow to congestion and not back off as fast.
-``utp_min_timeout`` is the shortest allowed uTP socket timeout, specified in milliseconds.
-This defaults to 500 milliseconds. The timeout depends on the RTT of the connection, but
-is never smaller than this value. A connection times out when every packet in a window
-is lost, or when a packet is lost twice in a row (i.e. the resent packet is lost as well).
+``utp_gain_factor`` is the number of bytes the uTP congestion
+window can increase at the most in one RTT. This defaults to 300
+bytes. If this is set too high, the congestion controller reacts
+too hard to noise and will not be stable, if it's set too low, it
+will react slow to congestion and not back off as fast.
+``utp_min_timeout`` is the shortest allowed uTP socket timeout,
+specified in milliseconds. This defaults to 500 milliseconds. The
+timeout depends on the RTT of the connection, but is never smaller
+than this value. A connection times out when every packet in a
+window is lost, or when a packet is lost twice in a row (i.e. the
+resent packet is lost as well).
 
-The shorter the timeout is, the faster the connection will recover from this situation,
-assuming the RTT is low enough.
-``utp_syn_resends`` is the number of SYN packets that are sent (and timed out) before
-giving up and closing the socket.
-``utp_num_resends`` is the number of times a packet is sent (and lossed or timed out)
-before giving up and closing the connection.
-``utp_connect_timeout`` is the number of milliseconds of timeout for the initial SYN
-packet for uTP connections. For each timed out packet (in a row), the timeout is doubled.
-``utp_loss_multiplier`` controls how the congestion window is changed when a packet
-loss is experienced. It's specified as a percentage multiplier for ``cwnd``. By default
-it's set to 50 (i.e. cut in half). Do not change this value unless you know what
-you're doing. Never set it higher than 100.
+The shorter the timeout is, the faster the connection will recover
+from this situation, assuming the RTT is low enough.
+``utp_syn_resends`` is the number of SYN packets that are sent (and
+timed out) before giving up and closing the socket.
+``utp_num_resends`` is the number of times a packet is sent (and
+lossed or timed out) before giving up and closing the connection.
+``utp_connect_timeout`` is the number of milliseconds of timeout
+for the initial SYN packet for uTP connections. For each timed out
+packet (in a row), the timeout is doubled. ``utp_loss_multiplier``
+controls how the congestion window is changed when a packet loss is
+experienced. It's specified as a percentage multiplier for
+``cwnd``. By default it's set to 50 (i.e. cut in half). Do not
+change this value unless you know what you're doing. Never set it
+higher than 100.
 
 .. _mixed_mode_algorithm:
 
@@ -2764,14 +2825,17 @@ you're doing. Never set it higher than 100.
 | mixed_mode_algorithm | int  | settings_pack::peer_proportional |
 +----------------------+------+----------------------------------+
 
-The ``mixed_mode_algorithm`` determines how to treat TCP connections when there are
-uTP connections. Since uTP is designed to yield to TCP, there's an inherent problem
-when using swarms that have both TCP and uTP connections. If nothing is done, uTP
-connections would often be starved out for bandwidth by the TCP connections. This mode
-is ``prefer_tcp``. The ``peer_proportional`` mode simply looks at the current throughput
-and rate limits all TCP connections to their proportional share based on how many of
-the connections are TCP. This works best if uTP connections are not rate limited by
-the global rate limiter (which they aren't by default).
+The ``mixed_mode_algorithm`` determines how to treat TCP
+connections when there are uTP connections. Since uTP is designed
+to yield to TCP, there's an inherent problem when using swarms that
+have both TCP and uTP connections. If nothing is done, uTP
+connections would often be starved out for bandwidth by the TCP
+connections. This mode is ``prefer_tcp``. The ``peer_proportional``
+mode simply looks at the current throughput and rate limits all TCP
+connections to their proportional share based on how many of the
+connections are TCP. This works best if uTP connections are not
+rate limited by the global rate limiter (which they aren't by
+default).
 
 .. _listen_queue_size:
 
@@ -2785,13 +2849,14 @@ the global rate limiter (which they aren't by default).
 | listen_queue_size | int  | 5       |
 +-------------------+------+---------+
 
-``listen_queue_size`` is the value passed in to listen() for the listen socket.
-It is the number of outstanding incoming connections to queue up while we're not
-actively waiting for a connection to be accepted. The default is 5 which should
-be sufficient for any normal client. If this is a high performance server which
-expects to receive a lot of connections, or used in a simulator or test, it
-might make sense to raise this number. It will not take affect until listen_on()
-is called again (or for the first time).
+``listen_queue_size`` is the value passed in to listen() for the
+listen socket. It is the number of outstanding incoming connections
+to queue up while we're not actively waiting for a connection to be
+accepted. The default is 5 which should be sufficient for any
+normal client. If this is a high performance server which expects
+to receive a lot of connections, or used in a simulator or test, it
+might make sense to raise this number. It will not take affect
+until listen_on() is called again (or for the first time).
 
 .. _torrent_connect_boost:
 
@@ -2805,11 +2870,12 @@ is called again (or for the first time).
 | torrent_connect_boost | int  | 10      |
 +-----------------------+------+---------+
 
-``torrent_connect_boost`` is the number of peers to try to connect to immediately
-when the first tracker response is received for a torrent. This is a boost to
-given to new torrents to accelerate them starting up. The normal connect scheduler
-is run once every second, this allows peers to be connected immediately instead
-of waiting for the session tick to trigger connections.
+``torrent_connect_boost`` is the number of peers to try to connect
+to immediately when the first tracker response is received for a
+torrent. This is a boost to given to new torrents to accelerate
+them starting up. The normal connect scheduler is run once every
+second, this allows peers to be connected immediately instead of
+waiting for the session tick to trigger connections.
 
 .. _alert_queue_size:
 
@@ -2823,8 +2889,9 @@ of waiting for the session tick to trigger connections.
 | alert_queue_size | int  | 1000    |
 +------------------+------+---------+
 
-``alert_queue_size`` is the maximum number of alerts queued up internally. If
-alerts are not popped, the queue will eventually fill up to this level.
+``alert_queue_size`` is the maximum number of alerts queued up
+internally. If alerts are not popped, the queue will eventually
+fill up to this level.
 
 .. _max_metadata_size:
 
@@ -2838,8 +2905,9 @@ alerts are not popped, the queue will eventually fill up to this level.
 | max_metadata_size | int  | 3 * 1024 * 10240 |
 +-------------------+------+------------------+
 
-``max_metadata_size`` is the maximum allowed size (in bytes) to be received
-by the metadata extension, i.e. magnet links. It defaults to 1 MiB.
+``max_metadata_size`` is the maximum allowed size (in bytes) to be
+received by the metadata extension, i.e. magnet links. It defaults
+to 1 MiB.
 
 .. _hashing_threads:
 
@@ -2853,10 +2921,11 @@ by the metadata extension, i.e. magnet links. It defaults to 1 MiB.
 | hashing_threads | int  | 1       |
 +-----------------+------+---------+
 
-``hashing_threads`` is the number of threads to use for piece hash verification. It
-defaults to 1. For very high download rates, on machines with multiple cores, this
-could be incremented. Setting it higher than the number of CPU cores would presumably
-not provide any benefit of setting it to the number of cores. If it's set to 0,
+``hashing_threads`` is the number of threads to use for piece hash
+verification. It defaults to 1. For very high download rates, on
+machines with multiple cores, this could be incremented. Setting it
+higher than the number of CPU cores would presumably not provide
+any benefit of setting it to the number of cores. If it's set to 0,
 hashing is done in the disk thread.
 
 .. _checking_mem_usage:
@@ -2888,10 +2957,11 @@ more memory. Specified in number of 16 kiB blocks
 +---------------------------+------+---------+
 
 if set to > 0, pieces will be announced to other peers before they
-are fully downloaded (and before they are hash checked). The intention
-is to gain 1.5 potential round trip times per downloaded piece. When
-non-zero, this indicates how many milliseconds in advance pieces
-should be announced, before they are expected to be completed.
+are fully downloaded (and before they are hash checked). The
+intention is to gain 1.5 potential round trip times per downloaded
+piece. When non-zero, this indicates how many milliseconds in
+advance pieces should be announced, before they are expected to be
+completed.
 
 .. _aio_threads:
 
@@ -2911,7 +2981,8 @@ should be announced, before they are expected to be completed.
 +-------------+------+---------+
 
 for some aio back-ends, ``aio_threads`` specifies the number of
-io-threads to use,  and ``aio_max`` the max number of outstanding jobs.
+io-threads to use,  and ``aio_max`` the max number of outstanding
+jobs.
 
 .. _network_threads:
 
@@ -2925,12 +2996,13 @@ io-threads to use,  and ``aio_max`` the max number of outstanding jobs.
 | network_threads | int  | 0       |
 +-----------------+------+---------+
 
-``network_threads`` is the number of threads to use to call ``async_write_some``
-(i.e. send) on peer connection sockets. When seeding at extremely high rates,
-this may become a bottleneck, and setting this to 2 or more may parallelize
-that cost. When using SSL torrents, all encryption for outgoing traffic is
-done withint the socket send functions, and this will help parallelizing the
-cost of SSL encryption as well.
+``network_threads`` is the number of threads to use to call
+``async_write_some`` (i.e. send) on peer connection sockets. When
+seeding at extremely high rates, this may become a bottleneck, and
+setting this to 2 or more may parallelize that cost. When using SSL
+torrents, all encryption for outgoing traffic is done withint the
+socket send functions, and this will help parallelizing the cost of
+SSL encryption as well.
 
 .. _ssl_listen:
 
@@ -2944,10 +3016,11 @@ cost of SSL encryption as well.
 | ssl_listen | int  | 4433    |
 +------------+------+---------+
 
-``ssl_listen`` sets the listen port for SSL connections. If this is set to 0,
-no SSL listen port is opened. Otherwise a socket is opened on this port. This
-setting is only taken into account when opening the regular listen port, and
-won't re-open the listen socket simply by changing this setting.
+``ssl_listen`` sets the listen port for SSL connections. If this is
+set to 0, no SSL listen port is opened. Otherwise a socket is
+opened on this port. This setting is only taken into account when
+opening the regular listen port, and won't re-open the listen
+socket simply by changing this setting.
 
 .. _tracker_backoff:
 
@@ -2961,14 +3034,15 @@ won't re-open the listen socket simply by changing this setting.
 | tracker_backoff | int  | 250     |
 +-----------------+------+---------+
 
-``tracker_backoff`` determines how aggressively to back off from retrying
-failing trackers. This value determines *x* in the following formula, determining
-the number of seconds to wait until the next retry:
+``tracker_backoff`` determines how aggressively to back off from
+retrying failing trackers. This value determines *x* in the
+following formula, determining the number of seconds to wait until
+the next retry:
 
    delay = 5 + 5 * x / 100 * fails^2
 
-This setting may be useful to make libtorrent more or less aggressive in hitting
-trackers.
+This setting may be useful to make libtorrent more or less
+aggressive in hitting trackers.
 
 .. _share_ratio_limit:
 
@@ -2987,12 +3061,11 @@ trackers.
 | seed_time_ratio_limit | int  | 700     |
 +-----------------------+------+---------+
 
-when a seeding torrent reaches eaither the share ratio
-(bytes up / bytes down) or the seed time ratio
-(seconds as seed / seconds as downloader) or the seed
-time limit (seconds as seed) it is considered
-done, and it will leave room for other torrents
-these are specified as percentages
+when a seeding torrent reaches eaither the share ratio (bytes up /
+bytes down) or the seed time ratio (seconds as seed / seconds as
+downloader) or the seed time limit (seconds as seed) it is
+considered done, and it will leave room for other torrents these
+are specified as percentages
 
 .. _peer_turnover:
 
@@ -3016,17 +3089,14 @@ these are specified as percentages
 | peer_turnover_interval | int  | 300     |
 +------------------------+------+---------+
 
-peer_turnover is the percentage of peers to disconnect
-every turnover peer_turnover_interval (if we're at
-the peer limit), this is specified in percent
-when we are connected to more than
-limit * peer_turnover_cutoff peers
-disconnect peer_turnover fraction
-of the peers. It is specified in percent
-peer_turnover_interval is the interval (in seconds)
-between optimistic disconnects
-if the disconnects happen and how many peers are disconnected
-is controlled by peer_turnover and peer_turnover_cutoff
+peer_turnover is the percentage of peers to disconnect every
+turnover peer_turnover_interval (if we're at the peer limit), this
+is specified in percent when we are connected to more than limit *
+peer_turnover_cutoff peers disconnect peer_turnover fraction of the
+peers. It is specified in percent peer_turnover_interval is the
+interval (in seconds) between optimistic disconnects if the
+disconnects happen and how many peers are disconnected is
+controlled by peer_turnover and peer_turnover_cutoff
 
 .. _connect_seed_every_n_download:
 
@@ -3040,18 +3110,17 @@ is controlled by peer_turnover and peer_turnover_cutoff
 | connect_seed_every_n_download | int  | 10      |
 +-------------------------------+------+---------+
 
-this setting controls the priority of downloading torrents
-over seeding or finished torrents when it comes to making
-peer connections. Peer connections are throttled by the
-connection_speed and the half-open connection limit. This
-makes peer connections a limited resource. Torrents that
-still have pieces to download are prioritized by default,
-to avoid having many seeding torrents use most of the connection
-attempts and only give one peer every now and then to the
-downloading torrent. libtorrent will loop over the downloading
-torrents to connect a peer each, and every n:th connection
-attempt, a finished torrent is picked to be allowed to connect
-to a peer. This setting controls n.
+this setting controls the priority of downloading torrents over
+seeding or finished torrents when it comes to making peer
+connections. Peer connections are throttled by the connection_speed
+and the half-open connection limit. This makes peer connections a
+limited resource. Torrents that still have pieces to download are
+prioritized by default, to avoid having many seeding torrents use
+most of the connection attempts and only give one peer every now
+and then to the downloading torrent. libtorrent will loop over the
+downloading torrents to connect a peer each, and every n:th
+connection attempt, a finished torrent is picked to be allowed to
+connect to a peer. This setting controls n.
 
 .. _max_http_recv_buffer_size:
 
@@ -3066,8 +3135,8 @@ to a peer. This setting controls n.
 +---------------------------+------+------------+
 
 the max number of bytes to allow an HTTP response to be when
-announcing to trackers or downloading .torrent files via
-the ``url`` provided in ``add_torrent_params``.
+announcing to trackers or downloading .torrent files via the
+``url`` provided in ``add_torrent_params``.
 
 .. _max_retry_port_bind:
 
@@ -3097,8 +3166,8 @@ retry a failed port bind
 | alert_mask | int  | alert::error_notification |
 +------------+------+---------------------------+
 
-a bitmask combining flags from alert::category_t defining
-which kinds of alerts to receive
+a bitmask combining flags from alert::category_t defining which
+kinds of alerts to receive
 
 .. _out_enc_policy:
 
@@ -3117,9 +3186,8 @@ which kinds of alerts to receive
 | in_enc_policy  | int  | settings_pack::pe_enabled |
 +----------------+------+---------------------------+
 
-control the settings for incoming
-and outgoing connections respectively.
-see enc_policy enum for the available options.
+control the settings for incoming and outgoing connections
+respectively. see enc_policy enum for the available options.
 
 .. _allowed_enc_level:
 
@@ -3133,10 +3201,10 @@ see enc_policy enum for the available options.
 | allowed_enc_level | int  | settings_pack::pe_both |
 +-------------------+------+------------------------+
 
-determines the encryption level of the
-connections.  This setting will adjust which encryption scheme is
-offered to the other peer, as well as which encryption scheme is
-selected by the client. See enc_level enum for options.
+determines the encryption level of the connections.  This setting
+will adjust which encryption scheme is offered to the other peer,
+as well as which encryption scheme is selected by the client. See
+enc_level enum for options.
 
 .. _inactive_down_rate:
 
@@ -3156,8 +3224,8 @@ selected by the client. See enc_level enum for options.
 +--------------------+------+---------+
 
 the download and upload rate limits for a torrent to be considered
-active by the queuing mechanism. A torrent whose download rate is less
-than ``inactive_down_rate`` and whose upload rate is less than
+active by the queuing mechanism. A torrent whose download rate is
+less than ``inactive_down_rate`` and whose upload rate is less than
 ``inactive_up_rate`` for ``auto_manage_startup`` seconds, is
 considered inactive, and another queued torrent may be startert.
 This logic is disabled if ``dont_count_slow_torrents`` is false.
diff --git a/docs/todo.html b/docs/todo.html
index aee04937b..287f938ef 100644
--- a/docs/todo.html
+++ b/docs/todo.html
@@ -22,10 +22,10 @@
 </head><body>
 <h1>libtorrent todo-list</h1>
 <span style="color: #f00">0 urgent</span>
-<span style="color: #f77">15 important</span>
+<span style="color: #f77">9 important</span>
 <span style="color: #3c3">33 relevant</span>
-<span style="color: #77f">8 feasible</span>
-<span style="color: #999">138 notes</span>
+<span style="color: #77f">9 feasible</span>
+<span style="color: #999">139 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)">../test/test_dht.cpp:436</a></td><td>test obfuscated_get_peers</td></tr><tr id="0" style="display: none;" colspan="3"><td colspan="3"><h2>test obfuscated_get_peers</h2><h4>../test/test_dht.cpp:436</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	g_got_peers.insert(g_got_peers.end(), peers.begin(), peers.end());
 }
 
@@ -128,58 +128,7 @@ bool get_item_cb(dht::item&amp; i)
 			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: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(2)">../src/disk_io_thread.cpp:233</a></td><td>it would be nice to have the number of threads be set dynamically</td></tr><tr id="2" 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:233</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
-
-#ifdef TORRENT_DISK_STATS
-		if (g_access_log)
-		{
-			FILE* f = g_access_log;
-			g_access_log = NULL;
-			fclose(f);
-		}
-#endif
-
-		TORRENT_ASSERT(m_magic == 0x1337);
-#if TORRENT_USE_ASSERTS
-		m_magic = 0xdead;
-#endif
-	}
-
-<div style="background: #ffff00" width="100%">	void disk_io_thread::set_num_threads(int i, bool wait)
-</div>	{
-		TORRENT_ASSERT(m_magic == 0x1337);
-		if (i == m_num_threads) return;
-
-		if (i &gt; m_num_threads)
-		{
-			while (m_num_threads &lt; i)
-			{
-				int thread_id = (++m_num_threads) - 1;
-				thread_type_t type = generic_thread;
-
-				// the magic number 3 is also used in add_job()
-				// every 4:th thread is a hasher thread
-				if ((thread_id &amp; 0x3) == 3) type = hasher_thread;
-				m_threads.push_back(boost::shared_ptr&lt;thread&gt;(
-					new thread(boost::bind(&amp;disk_io_thread::thread_fun, this, thread_id, type))));
-			}
-		}
-		else
-		{
-			while (m_num_threads &gt; i) { --m_num_threads; }
-			mutex::scoped_lock l(m_job_mutex);
-			m_job_cond.notify_all();
-			m_hash_job_cond.notify_all();
-			l.unlock();
-			if (wait) for (int i = m_num_threads; i &lt; m_threads.size(); ++i) m_threads[i]-&gt;join();
-			// this will detach the threads
-			m_threads.resize(m_num_threads);
-		}
-	}
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(3)">../src/peer_connection.cpp:2992</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="3" 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: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(2)">../src/peer_connection.cpp:2992</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="2" 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
@@ -234,7 +183,7 @@ 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: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(4)">../src/piece_picker.cpp:3166</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</td></tr><tr id="4" 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: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(3)">../src/piece_picker.cpp:3166</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</td></tr><tr id="3" 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</h2><h4>../src/piece_picker.cpp:3166</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		int state = m_piece_map[piece].state;
 		if (state == piece_pos::piece_open) return;
@@ -287,8 +236,8 @@ counter and the passed_hash_check member</h2><h4>../src/piece_picker.cpp:3166</h
 		if (info.state == block_info::state_writing) --i-&gt;writing;
 
 		info.peer = 0;
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(5)">../src/session_impl.cpp:5192</a></td><td>deprecate this function. All of this functionality should be exposed as performance counters</td></tr><tr id="5" style="display: none;" colspan="3"><td colspan="3"><h2>deprecate this function. All of this functionality should be
-exposed as performance counters</h2><h4>../src/session_impl.cpp:5192</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (m_alerts.should_post&lt;portmap_alert&gt;())
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(4)">../src/session_impl.cpp:5195</a></td><td>deprecate this function. All of this functionality should be exposed as performance counters</td></tr><tr id="4" style="display: none;" colspan="3"><td colspan="3"><h2>deprecate this function. All of this functionality should be
+exposed as performance counters</h2><h4>../src/session_impl.cpp:5195</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (m_alerts.should_post&lt;portmap_alert&gt;())
 				m_alerts.post_alert(portmap_alert(mapping, port
 					, map_transport));
 			return;
@@ -339,110 +288,7 @@ exposed as performance counters</h2><h4>../src/session_impl.cpp:5192</h4><pre st
 		s.disk_write_queue = m_stats_counters[counters::num_peers_down_disk];
 		s.disk_read_queue = m_stats_counters[counters::num_peers_up_disk];
 
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(6)">../src/session_impl.cpp:5782</a></td><td>If socket jobs could be higher level, to include RC4 encryption and decryption, we would offload the main thread even more</td></tr><tr id="6" style="display: none;" colspan="3"><td colspan="3"><h2>If socket jobs could be higher level, to include RC4 encryption and decryption,
-we would offload the main thread even more</h2><h4>../src/session_impl.cpp:5782</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
-		int num_threads = m_settings.get_int(settings_pack::network_threads);
-		int num_pools = num_threads &gt; 0 ? num_threads : 1;
-		while (num_pools &gt; m_net_thread_pool.size())
-		{
-			m_net_thread_pool.push_back(boost::make_shared&lt;network_thread_pool&gt;());
-			m_net_thread_pool.back()-&gt;set_num_threads(1);
-		}
-
-		while (num_pools &lt; m_net_thread_pool.size())
-		{
-			m_net_thread_pool.erase(m_net_thread_pool.end() - 1);
-		}
-
-		if (num_threads == 0 &amp;&amp; m_net_thread_pool.size() &gt; 0)
-		{
-			m_net_thread_pool[0]-&gt;set_num_threads(0);
-		}
-	}
-
-<div style="background: #ffff00" width="100%">	void session_impl::post_socket_job(socket_job&amp; j)
-</div>	{
-		uintptr_t idx = 0;
-		if (m_net_thread_pool.size() &gt; 1)
-		{
-			// each peer needs to be pinned to a specific thread
-			// since reading and writing simultaneously on the same
-			// socket from different threads is not supported by asio.
-			// as long as a specific socket is consistently used from
-			// the same thread, it's safe
-			idx = uintptr_t(j.peer.get());
-			idx ^= idx &gt;&gt; 8;
-			idx %= m_net_thread_pool.size();
-		}
-		m_net_thread_pool[idx]-&gt;post_job(j);
-	}
-
-	void session_impl::update_cache_buffer_chunk_size()
-	{
-		if (m_settings.get_int(settings_pack::cache_buffer_chunk_size) &lt;= 0)
-			m_settings.set_int(settings_pack::cache_buffer_chunk_size, 1);
-	}
-
-	void session_impl::update_report_web_seed_downloads()
-	{
-		// if this flag changed, update all web seed connections
-		bool report = m_settings.get_bool(settings_pack::report_web_seed_downloads);
-		for (connection_map::iterator i = m_connections.begin()
-			, end(m_connections.end()); i != end; ++i)
-		{
-			int type = (*i)-&gt;type();
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(7)">../src/torrent.cpp:1069</a></td><td>if any other peer has a busy request to this block, we need to cancel it too</td></tr><tr id="7" style="display: none;" colspan="3"><td colspan="3"><h2>if any other peer has a busy request to this block, we need to cancel it too</h2><h4>../src/torrent.cpp:1069</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#endif
-
-		TORRENT_ASSERT(j-&gt;piece &gt;= 0);
-
-		if (j-&gt;action == disk_io_job::write)
-		{
-			piece_block block_finished(j-&gt;piece, j-&gt;d.io.offset / block_size());
-
-			// we failed to write j-&gt;piece to disk tell the piece picker
-			if (j-&gt;piece &gt;= 0)
-			{
-				// this will block any other peer from issuing requests
-				// to this piece, until we've cleared it.
-				if (j-&gt;error.ec == asio::error::operation_aborted)
-				{
-					if (has_picker())
-						picker().mark_as_canceled(block_finished, NULL);
-				}
-				else
-				{
-<div style="background: #ffff00" width="100%">					if (has_picker())
-</div>						picker().write_failed(block_finished);
-
-					if (m_storage)
-					{
-						// when this returns, all outstanding jobs to the
-						// piece are done, and we can restore it, allowing
-						// new requests to it
-						m_ses.disk_thread().async_clear_piece(m_storage.get(), j-&gt;piece
-							, boost::bind(&amp;torrent::on_piece_fail_sync, shared_from_this(), _1, block_finished));
-					}
-					else
-					{
-						// is m_abort true? if so, we should probably just
-						// exit this function early, no need to keep the picker
-						// state up-to-date, right?
-						disk_io_job sj;
-						sj.piece = j-&gt;piece;
-						on_piece_fail_sync(&amp;sj, block_finished);
-					}
-				}
-				update_gauge();
-			}
-		}
-
-		if (j-&gt;error.ec == error_code(boost::system::errc::not_enough_memory, generic_category()))
-		{
-			if (alerts().should_post&lt;file_error_alert&gt;())
-				alerts().post_alert(file_error_alert(j-&gt;error.ec
-					, resolve_filename(j-&gt;error.file), j-&gt;error.operation_str(), get_handle()));
-			if (c) c-&gt;disconnect(errors::no_memory, peer_connection_interface::op_file);
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(8)">../src/torrent.cpp:7679</a></td><td>if peer is a really good peer, maybe we shouldn't disconnect it</td></tr><tr id="8" 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:7679</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if defined TORRENT_LOGGING
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(5)">../src/torrent.cpp:7713</a></td><td>if peer is a really good peer, maybe we shouldn't disconnect it</td></tr><tr id="5" 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:7713</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if defined TORRENT_LOGGING
 		debug_log("incoming peer (%d)", int(m_connections.size()));
 #endif
 
@@ -493,7 +339,7 @@ we would offload the main thread even more</h2><h4>../src/session_impl.cpp:5782<
 		if (m_abort) return false;
 
 		if (!m_connections.empty()) return true;
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(9)">../src/web_peer_connection.cpp:596</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="9" style="display: none;" colspan="3"><td colspan="3"><h2>just make this peer not have the pieces
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(6)">../src/web_peer_connection.cpp:596</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="6" 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:596</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
 			++m_num_responses;
@@ -546,7 +392,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: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(10)">../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="10" 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()
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(7)">../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="7" 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; " ]" ;
 #endif
@@ -597,58 +443,7 @@ void get_item_observer::reply(msg const&amp; m)
 	boost::uint64_t seq = 0;
 
 	lazy_entry const* r = m.message.dict_find_dict("r");
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(11)">../src/kademlia/routing_table.cpp:884</a></td><td>move the lowest priority nodes to the replacement bucket</td></tr><tr id="11" 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:884</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())
-	// to the new bucket
-	int new_bucket_size = bucket_limit(bucket_index + 1);
-	for (bucket_t::iterator j = b.begin(); j != b.end();)
-	{
-		if (distance_exp(m_id, j-&gt;id) &gt;= 159 - bucket_index)
-		{
-			++j;
-			continue;
-		}
-		// this entry belongs in the new bucket
-		new_bucket.push_back(*j);
-		j = b.erase(j);
-	}
-
-	if (b.size() &gt; bucket_size_limit)
-	{
-<div style="background: #ffff00" width="100%">		for (bucket_t::iterator i = b.begin() + bucket_size_limit
-</div>			, end(b.end()); i != end; ++i)
-		{
-			rb.push_back(*i);
-		}
-
-		b.resize(bucket_size_limit);
-	}
-
-	// split the replacement bucket as well. If the live bucket
-	// is not full anymore, also move the replacement entries
-	// into the main bucket
-	for (bucket_t::iterator j = rb.begin(); j != rb.end();)
-	{
-		if (distance_exp(m_id, j-&gt;id) &gt;= 159 - bucket_index)
-		{
-			if (int(b.size()) &gt;= bucket_size_limit)
-			{
-				++j;
-				continue;
-			}
-			b.push_back(*j);
-		}
-		else
-		{
-			// this entry belongs in the new bucket
-			if (int(new_bucket.size()) &lt; new_bucket_size)
-				new_bucket.push_back(*j);
-			else
-				new_replacement_bucket.push_back(*j);
-		}
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(12)">../include/libtorrent/block_cache.hpp:209</a></td><td>could this be a scoped_array instead? does cached_piece_entry really need to be copyable? cached_piece_entry does need to be copyable since it's part of a container, but it's possible it could be a raw pointer or boost::unique_ptr perhaps</td></tr><tr id="12" style="display: none;" colspan="3"><td colspan="3"><h2>could this be a scoped_array instead? does cached_piece_entry
+</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(8)">../include/libtorrent/block_cache.hpp:209</a></td><td>could this be a scoped_array instead? does cached_piece_entry really need to be copyable? cached_piece_entry does need to be copyable since it's part of a container, but it's possible it could be a raw pointer or boost::unique_ptr perhaps</td></tr><tr id="8" style="display: none;" colspan="3"><td colspan="3"><h2>could this be a scoped_array instead? does cached_piece_entry
 really need to be copyable? cached_piece_entry does need to be
 copyable since it's part of a container, but it's possible it could be
 a raw pointer or boost::unique_ptr perhaps</h2><h4>../include/libtorrent/block_cache.hpp:209</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		tailqueue read_jobs;
@@ -676,111 +471,7 @@ a raw pointer or boost::unique_ptr perhaps</h2><h4>../include/libtorrent/block_c
 		// the last time a block was written to this piece
 		// plus the minimum amount of time the block is guaranteed
 		// to stay in the cache
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(13)">../include/libtorrent/session.hpp:204</a></td><td>could the fingerprint be a setting as well? And should the settings_pack be optional?</td></tr><tr id="13" style="display: none;" colspan="3"><td colspan="3"><h2>could the fingerprint be a setting as well? And should the
-settings_pack be optional?</h2><h4>../include/libtorrent/session.hpp:204</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// 
-	// see apply_settings().
-	class TORRENT_EXPORT session: public boost::noncopyable
-	{
-	public:
-
-		// If the fingerprint in the first overload is omited, the client will
-		// get a default fingerprint stating the version of libtorrent. The
-		// fingerprint is a short string that will be used in the peer-id to
-		// identify the client and the client's version. For more details see the
-		// fingerprint class.
-		// 
-		// The flags paramater can be used to start default features (upnp &amp;
-		// 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,
-		// pass 0 as the flags parameter.
-		// 
-		// The ``alert_mask`` is the same mask that you would send to
-		// set_alert_mask().
-
-<div style="background: #ffff00" width="100%">		session(settings_pack const&amp; pack
-</div>			, fingerprint const&amp; print = fingerprint("LT"
-				, LIBTORRENT_VERSION_MAJOR, LIBTORRENT_VERSION_MINOR, 0, 0)
-			, int flags = start_default_features | add_default_plugins)
-		{
-			TORRENT_CFG();
-			init(print);
-			start(flags, pack);
-		}
-		session(fingerprint const&amp; print = fingerprint("LT"
-			, LIBTORRENT_VERSION_MAJOR, LIBTORRENT_VERSION_MINOR, 0, 0)
-			, int flags = start_default_features | add_default_plugins
-			, boost::uint32_t alert_mask = alert::error_notification)
-		{
-			TORRENT_CFG();
-			settings_pack pack;
-			pack.set_int(settings_pack::alert_mask, alert_mask);
-			if ((flags &amp; start_default_features) == 0)
-			{
-				pack.set_bool(settings_pack::enable_upnp, false);
-				pack.set_bool(settings_pack::enable_natpmp, false);
-				pack.set_bool(settings_pack::enable_lsd, false);
-				pack.set_bool(settings_pack::enable_dht, false);
-			}
-
-			init(print);
-			start(flags, pack);
-		}
-		session(fingerprint const&amp; print
-			, std::pair&lt;int, int&gt; listen_port_range
-			, char const* listen_interface = "0.0.0.0"
-</pre></td></tr><tr style="background: #fcc"><td>relevance&nbsp;3</td><td><a href="javascript:expand(14)">../include/libtorrent/torrent_info.hpp:222</a></td><td>this type should be different from the one used by torrent. It should not include internal state.</td></tr><tr id="14" style="display: none;" colspan="3"><td colspan="3"><h2>this type should be different from the one used by torrent. It
-should not include internal state.</h2><h4>../include/libtorrent/torrent_info.hpp:222</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				&amp;&amp; !updating;
-		}
-#endif
-
-		// returns true if we can announec to this tracker now.
-		// The current time is passed in as ``now``. The ``is_seed``
-		// argument is necessary because once we become a seed, we
-		// need to announce right away, even if the re-announce timer
-		// hasn't expired yet.
-		bool can_announce(ptime now, bool is_seed) const;
-
-		// returns true if the last time we tried to announce to this
-		// tracker succeeded, or if we haven't tried yet.
-		bool is_working() const
-		{ return fails == 0; }
-
-		// trims whitespace characters from the beginning of the URL.
-		void trim();
-	};
-
-<div style="background: #ffff00" width="100%">
-</div>	// the web_seed_entry holds information about a web seed (also known
-	// as URL seed or HTTP seed). It is essentially a URL with some state
-	// associated with it. For more information, see `BEP 17`_ and `BEP 19`_.
-	struct web_seed_entry
-	{
-		// http seeds are different from url seeds in the
-		// protocol they use. http seeds follows the original
-		// http seed spec. by John Hoffman
-		enum type_t { url_seed, http_seed };
-
-		typedef std::vector&lt;std::pair&lt;std::string, std::string&gt; &gt; headers_t;
-
-		web_seed_entry(std::string const&amp; url_, type_t type_
-			, std::string const&amp; auth_ = std::string()
-			, headers_t const&amp; extra_headers_ = headers_t());
-
-		// URL and type comparison
-		bool operator==(web_seed_entry const&amp; e) const
-		{ return url == e.url &amp;&amp; type == e.type; }
-
-		// URL and type less-than comparison
-		bool operator&lt;(web_seed_entry const&amp; e) const
-		{
-			if (url &lt; e.url) return true;
-			if (url &gt; e.url) return false;
-		  	return type &lt; e.type;
-		}
-
-		// The URL of the web seed
-		std::string url;
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(15)">../test/test_resume.cpp:331</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="15" 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: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(9)">../test/test_resume.cpp:331</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="9" 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:331</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	// resume data overrides the paused flag
 	fprintf(stderr, "flags: paused\n");
@@ -806,7 +497,7 @@ and trackers for instance</h2><h4>../test/test_resume.cpp:331</h4><pre style="ba
 </div>}
 
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(16)">../src/disk_io_thread.cpp:835</a></td><td>should this be allocated on the stack?</td></tr><tr id="16" style="display: none;" colspan="3"><td colspan="3"><h2>should this be allocated on the stack?</h2><h4>../src/disk_io_thread.cpp:835</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// if we're also flushing the read cache, this piece
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(10)">../src/disk_io_thread.cpp:835</a></td><td>should this be allocated on the stack?</td></tr><tr id="10" style="display: none;" colspan="3"><td colspan="3"><h2>should this be allocated on the stack?</h2><h4>../src/disk_io_thread.cpp:835</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// if we're also flushing the read cache, this piece
 			// should be removed as soon as all write jobs finishes
 			// otherwise it will turn into a read piece
 		}
@@ -857,7 +548,7 @@ and trackers for instance</h2><h4>../test/test_resume.cpp:331</h4><pre style="ba
 				{
 					cached_piece_entry* pe = m_disk_cache.find_piece(storage, (*i)-&gt;piece);
 					TORRENT_PIECE_ASSERT(pe-&gt;num_dirty == 0, pe);
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(17)">../src/disk_io_thread.cpp:876</a></td><td>we're not flushing the read cache at all?</td></tr><tr id="17" style="display: none;" colspan="3"><td colspan="3"><h2>we're not flushing the read cache at all?</h2><h4>../src/disk_io_thread.cpp:876</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// from disk_io_thread::do_delete, which is a fence job and should
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(11)">../src/disk_io_thread.cpp:876</a></td><td>we're not flushing the read cache at all?</td></tr><tr id="11" style="display: none;" colspan="3"><td colspan="3"><h2>we're not flushing the read cache at all?</h2><h4>../src/disk_io_thread.cpp:876</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
 			if ((flags &amp; flush_delete_cache) &amp;&amp; (flags &amp; flush_expect_clear))
@@ -908,7 +599,7 @@ and trackers for instance</h2><h4>../test/test_resume.cpp:331</h4><pre style="ba
 			if (e-&gt;num_dirty == 0) continue;
 			pieces.push_back(std::make_pair(e-&gt;storage.get(), int(e-&gt;piece)));
 		}
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(18)">../src/file.cpp:1501</a></td><td>use vm_copy here, if available, and if buffers are aligned</td></tr><tr id="18" style="display: none;" colspan="3"><td colspan="3"><h2>use vm_copy here, if available, and if buffers are aligned</h2><h4>../src/file.cpp:1501</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		CloseHandle(native_handle());
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(12)">../src/file.cpp:1501</a></td><td>use vm_copy here, if available, and if buffers are aligned</td></tr><tr id="12" style="display: none;" colspan="3"><td colspan="3"><h2>use vm_copy here, if available, and if buffers are aligned</h2><h4>../src/file.cpp:1501</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		CloseHandle(native_handle());
 		m_path.clear();
 #else
 		if (m_file_handle != INVALID_HANDLE_VALUE)
@@ -938,7 +629,7 @@ and trackers for instance</h2><h4>../test/test_resume.cpp:331</h4><pre style="ba
 		int offset = 0;
 		for (int i = 0; i &lt; num_bufs; ++i)
 		{
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(19)">../src/file.cpp:1512</a></td><td>use vm_copy here, if available, and if buffers are aligned</td></tr><tr id="19" style="display: none;" colspan="3"><td colspan="3"><h2>use vm_copy here, if available, and if buffers are aligned</h2><h4>../src/file.cpp:1512</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(13)">../src/file.cpp:1512</a></td><td>use vm_copy here, if available, and if buffers are aligned</td></tr><tr id="13" style="display: none;" colspan="3"><td colspan="3"><h2>use vm_copy here, if available, and if buffers are aligned</h2><h4>../src/file.cpp:1512</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	}
 
 	// defined in storage.cpp
 	int bufs_size(file::iovec_t const* bufs, int num_bufs);
@@ -989,7 +680,7 @@ and trackers for instance</h2><h4>../test/test_resume.cpp:331</h4><pre style="ba
 		// issue a single write operation instead of using a vector
 		// operation
 		int buf_size = 0;
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(20)">../src/file_storage.cpp:480</a></td><td>it would be nice if file_entry::filehash could be taken into account as well, and if the file_storage object could actually hold copies of filehash</td></tr><tr id="20" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice if file_entry::filehash could be taken into
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(14)">../src/file_storage.cpp:480</a></td><td>it would be nice if file_entry::filehash could be taken into account as well, and if the file_storage object could actually hold copies of filehash</td></tr><tr id="14" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice if file_entry::filehash could be taken into
 account as well, and if the file_storage object could actually hold
 copies of filehash</h2><h4>../src/file_storage.cpp:480</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		e.executable_attribute = (flags &amp; attribute_executable) != 0;
 		if ((flags &amp; attribute_symlink) &amp;&amp; m_symlinks.size() &lt; internal_file_entry::not_a_symlink - 1)
@@ -1042,7 +733,7 @@ copies of filehash</h2><h4>../src/file_storage.cpp:480</h4><pre style="backgroun
 		}
 		if (!ent.symlink_path.empty() &amp;&amp; m_symlinks.size() &lt; internal_file_entry::not_a_symlink - 1)
 		{
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(21)">../src/peer_connection.cpp:4596</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="21" 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(15)">../src/peer_connection.cpp:4596</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="15" 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:4596</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (is_i2p(*m_socket))
@@ -1096,7 +787,7 @@ entirely eventually</h2><h4>../src/peer_connection.cpp:4596</h4><pre style="back
 			&amp;&amp; !m_connecting
 			&amp;&amp; m_requests.empty()
 			&amp;&amp; m_reading_bytes == 0
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(22)">../src/session_impl.cpp:216</a></td><td>find a better place for this function</td></tr><tr id="22" style="display: none;" colspan="3"><td colspan="3"><h2>find a better place for this function</h2><h4>../src/session_impl.cpp:216</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(16)">../src/session_impl.cpp:216</a></td><td>find a better place for this function</td></tr><tr id="16" style="display: none;" colspan="3"><td colspan="3"><h2>find a better place for this function</h2><h4>../src/session_impl.cpp:216</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
@@ -1147,10 +838,10 @@ namespace aux {
 		const static class_mapping v4_classes[] =
 		{
 			// everything
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(23)">../src/session_impl.cpp:1818</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="23" 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(17)">../src/session_impl.cpp:1807</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="17" 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:1818</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				}
+listen_interfaces list</h2><h4>../src/session_impl.cpp:1807</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				}
 #endif // TORRENT_USE_OPENSSL
 			}
 #endif // TORRENT_USE_IPV6
@@ -1201,7 +892,7 @@ listen_interfaces list</h2><h4>../src/session_impl.cpp:1818</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(24)">../src/session_impl.cpp:1913</a></td><td>use bind_to_device in udp_socket</td></tr><tr id="24" style="display: none;" colspan="3"><td colspan="3"><h2>use bind_to_device in udp_socket</h2><h4>../src/session_impl.cpp:1913</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(18)">../src/session_impl.cpp:1902</a></td><td>use bind_to_device in udp_socket</td></tr><tr id="18" style="display: none;" colspan="3"><td colspan="3"><h2>use bind_to_device in udp_socket</h2><h4>../src/session_impl.cpp:1902</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		if (m_listen_sockets.empty() &amp;&amp; ec)
 		{
 #if defined TORRENT_LOGGING
@@ -1247,7 +938,7 @@ listen_interfaces list</h2><h4>../src/session_impl.cpp:1818</h4><pre style="back
 		}
 #endif
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(25)">../src/session_impl.cpp:1940</a></td><td>use bind_to_device in udp_socket</td></tr><tr id="25" style="display: none;" colspan="3"><td colspan="3"><h2>use bind_to_device in udp_socket</h2><h4>../src/session_impl.cpp:1940</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			session_log("SSL: cannot bind to UDP interface \"%s\": %s"
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(19)">../src/session_impl.cpp:1929</a></td><td>use bind_to_device in udp_socket</td></tr><tr id="19" style="display: none;" colspan="3"><td colspan="3"><h2>use bind_to_device in udp_socket</h2><h4>../src/session_impl.cpp:1929</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			session_log("SSL: cannot bind to UDP interface \"%s\": %s"
 				, print_endpoint(m_listen_interface).c_str(), ec.message().c_str());
 #endif
 			if (m_alerts.should_post&lt;listen_failed_alert&gt;())
@@ -1298,8 +989,8 @@ listen_interfaces list</h2><h4>../src/session_impl.cpp:1818</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(26)">../src/session_impl.cpp:3380</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="26" 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:3380</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (!m_dht_torrents.empty())
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(20)">../src/session_impl.cpp:3369</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="20" 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:3369</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (!m_dht_torrents.empty())
 		{
 			boost::shared_ptr&lt;torrent&gt; t;
 			do
@@ -1350,7 +1041,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(27)">../src/torrent.cpp:692</a></td><td>post alert</td></tr><tr id="27" style="display: none;" colspan="3"><td colspan="3"><h2>post alert</h2><h4>../src/torrent.cpp:692</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(21)">../src/torrent.cpp:718</a></td><td>post alert</td></tr><tr id="21" style="display: none;" colspan="3"><td colspan="3"><h2>post alert</h2><h4>../src/torrent.cpp:718</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		state_updated();
 
 		set_state(torrent_status::downloading);
 
@@ -1401,8 +1092,8 @@ don't have to loop over all torrents, just to find the ones that want to announc
 		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(28)">../src/torrent.cpp:4691</a></td><td>abort lookups this torrent has made via the session host resolver interface</td></tr><tr id="28" 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:4691</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// files belonging to the torrents
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(22)">../src/torrent.cpp:4719</a></td><td>abort lookups this torrent has made via the session host resolver interface</td></tr><tr id="22" 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:4719</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// files belonging to the torrents
 		disconnect_all(errors::torrent_aborted, peer_connection_interface::op_bittorrent);
 
 		// post a message to the main thread to destruct
@@ -1453,7 +1144,7 @@ session host resolver interface</h2><h4>../src/torrent.cpp:4691</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(29)">../src/web_peer_connection.cpp:655</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="29" 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(23)">../src/web_peer_connection.cpp:655</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="23" 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:655</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">						== dl_target);
 #endif
@@ -1506,7 +1197,7 @@ peer_connection</h2><h4>../src/web_peer_connection.cpp:655</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(30)">../src/kademlia/dos_blocker.cpp:75</a></td><td>make these limits configurable</td></tr><tr id="30" style="display: none;" colspan="3"><td colspan="3"><h2>make these limits configurable</h2><h4>../src/kademlia/dos_blocker.cpp:75</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	bool dos_blocker::incoming(address addr, ptime now)
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(24)">../src/kademlia/dos_blocker.cpp:75</a></td><td>make these limits configurable</td></tr><tr id="24" style="display: none;" colspan="3"><td colspan="3"><h2>make these limits configurable</h2><h4>../src/kademlia/dos_blocker.cpp:75</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	bool dos_blocker::incoming(address addr, ptime now)
 	{
 		node_ban_entry* match = 0;
 		node_ban_entry* min = m_ban_nodes;
@@ -1557,7 +1248,7 @@ peer_connection</h2><h4>../src/web_peer_connection.cpp:655</h4><pre style="backg
 			min-&gt;limit = now + seconds(10);
 			min-&gt;src = addr;
 		}
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(31)">../src/kademlia/node.cpp:67</a></td><td>make this configurable in dht_settings</td></tr><tr id="31" style="display: none;" colspan="3"><td colspan="3"><h2>make this configurable in dht_settings</h2><h4>../src/kademlia/node.cpp:67</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include "libtorrent/kademlia/routing_table.hpp"
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(25)">../src/kademlia/node.cpp:67</a></td><td>make this configurable in dht_settings</td></tr><tr id="25" style="display: none;" colspan="3"><td colspan="3"><h2>make this configurable in dht_settings</h2><h4>../src/kademlia/node.cpp:67</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include "libtorrent/kademlia/routing_table.hpp"
 #include "libtorrent/kademlia/node.hpp"
 #include "libtorrent/kademlia/dht_observer.hpp"
 
@@ -1608,7 +1299,7 @@ void purge_peers(std::set&lt;peer_entry&gt;&amp; peers)
 
 void nop() {}
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(32)">../src/kademlia/node.cpp:495</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="32" style="display: none;" colspan="3"><td colspan="3"><h2>it would be nice to have a bias towards node-id prefixes that
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(26)">../src/kademlia/node.cpp:495</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="26" 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:495</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;
@@ -1660,7 +1351,7 @@ void node_impl::send_single_refresh(udp::endpoint const&amp; ep, int bucket
 time_duration node_impl::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(33)">../src/kademlia/node.cpp:892</a></td><td>find_node should write directly to the response entry</td></tr><tr id="33" style="display: none;" colspan="3"><td colspan="3"><h2>find_node should write directly to the response entry</h2><h4>../src/kademlia/node.cpp:892</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(27)">../src/kademlia/node.cpp:892</a></td><td>find_node should write directly to the response entry</td></tr><tr id="27" style="display: none;" colspan="3"><td colspan="3"><h2>find_node should write directly to the response entry</h2><h4>../src/kademlia/node.cpp:892</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			TORRENT_LOG(node) &lt;&lt; " values: " &lt;&lt; reply["values"].list().size();
 		}
 #endif
 	}
@@ -1711,7 +1402,7 @@ time_duration node_impl::connection_timeout()
 		// listen port and instead use the source port of the packet?
 		if (msg_keys[5] &amp;&amp; msg_keys[5]-&gt;int_value() != 0)
 			port = m.addr.port();
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(34)">../src/kademlia/node_id.cpp:134</a></td><td>this could be optimized if SSE 4.2 is available. It could also be optimized given that we have a fixed length</td></tr><tr id="34" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized if SSE 4.2 is
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(28)">../src/kademlia/node_id.cpp:134</a></td><td>this could be optimized if SSE 4.2 is available. It could also be optimized given that we have a fixed length</td></tr><tr id="28" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized if SSE 4.2 is
 available. It could also be optimized given
 that we have a fixed length</h2><h4>../src/kademlia/node_id.cpp:134</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		b6 = ip_.to_v6().to_bytes();
 		ip = &amp;b6[0];
@@ -1764,7 +1455,58 @@ void make_id_secret(node_id&amp; in)
 	memcpy(&amp;in[20-4], &amp;secret_hash[0], 4);
 	memcpy(&amp;in[20-8], &amp;rand, 4);
 }
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(35)">../include/libtorrent/enum_net.hpp:137</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="35" 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(29)">../src/kademlia/routing_table.cpp:884</a></td><td>move the lowest priority nodes to the replacement bucket</td></tr><tr id="29" 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:884</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())
+	// to the new bucket
+	int new_bucket_size = bucket_limit(bucket_index + 1);
+	for (bucket_t::iterator j = b.begin(); j != b.end();)
+	{
+		if (distance_exp(m_id, j-&gt;id) &gt;= 159 - bucket_index)
+		{
+			++j;
+			continue;
+		}
+		// this entry belongs in the new bucket
+		new_bucket.push_back(*j);
+		j = b.erase(j);
+	}
+
+	if (b.size() &gt; bucket_size_limit)
+	{
+<div style="background: #ffff00" width="100%">		for (bucket_t::iterator i = b.begin() + bucket_size_limit
+</div>			, end(b.end()); i != end; ++i)
+		{
+			rb.push_back(*i);
+		}
+
+		b.resize(bucket_size_limit);
+	}
+
+	// split the replacement bucket as well. If the live bucket
+	// is not full anymore, also move the replacement entries
+	// into the main bucket
+	for (bucket_t::iterator j = rb.begin(); j != rb.end();)
+	{
+		if (distance_exp(m_id, j-&gt;id) &gt;= 159 - bucket_index)
+		{
+			if (int(b.size()) &gt;= bucket_size_limit)
+			{
+				++j;
+				continue;
+			}
+			b.push_back(*j);
+		}
+		else
+		{
+			// this entry belongs in the new bucket
+			if (int(new_bucket.size()) &lt; new_bucket_size)
+				new_bucket.push_back(*j);
+			else
+				new_replacement_bucket.push_back(*j);
+		}
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(30)">../include/libtorrent/enum_net.hpp:137</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="30" 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:137</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		address ip = address::from_string(device_name, ec);
 		if (!ec)
@@ -1816,7 +1558,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(36)">../include/libtorrent/intrusive_ptr_base.hpp:44</a></td><td>remove this class and transition over to using shared_ptr and make_shared instead</td></tr><tr id="36" style="display: none;" colspan="3"><td colspan="3"><h2>remove this class and transition over to using shared_ptr and
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(31)">../include/libtorrent/intrusive_ptr_base.hpp:44</a></td><td>remove this class and transition over to using shared_ptr and make_shared instead</td></tr><tr id="31" style="display: none;" colspan="3"><td colspan="3"><h2>remove this class and transition over to using shared_ptr and
 make_shared instead</h2><h4>../include/libtorrent/intrusive_ptr_base.hpp:44</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">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
@@ -1868,7 +1610,7 @@ namespace libtorrent
 
 		intrusive_ptr_base(): m_refs(0) {}
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(37)">../include/libtorrent/proxy_base.hpp:257</a></td><td>use the resolver interface that has a built-in cache</td></tr><tr id="37" 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:257</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(32)">../include/libtorrent/proxy_base.hpp:257</a></td><td>use the resolver interface that has a built-in cache</td></tr><tr id="32" 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:257</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		return m_sock.lowest_layer();
 	}
 
 	next_layer_type&amp; next_layer()
@@ -1895,7 +1637,7 @@ protected:
 
 #endif
 
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(38)">../include/libtorrent/session.hpp:270</a></td><td>the ip filter should probably be saved here too</td></tr><tr id="38" style="display: none;" colspan="3"><td colspan="3"><h2>the ip filter should probably be saved here too</h2><h4>../include/libtorrent/session.hpp:270</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(33)">../include/libtorrent/session.hpp:268</a></td><td>the ip filter should probably be saved here too</td></tr><tr id="33" style="display: none;" colspan="3"><td colspan="3"><h2>the ip filter should probably be saved here too</h2><h4>../include/libtorrent/session.hpp:268</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 			if ((flags &amp; start_default_features) == 0)
 			{
 				pack.set_bool(settings_pack::enable_upnp, false);
@@ -1903,7 +1645,7 @@ protected:
 				pack.set_bool(settings_pack::enable_lsd, false);
 				pack.set_bool(settings_pack::enable_dht, false);
 			}
-			init(print);
+			init();
 			start(flags, pack);
 		}
 			
@@ -1946,7 +1688,7 @@ protected:
 			save_dht_proxy = save_proxy,
 			save_peer_proxy = save_proxy,
 			save_web_proxy = save_proxy,
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(39)">../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="39" 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(34)">../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="34" 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"
@@ -1998,7 +1740,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(40)">../include/libtorrent/settings_pack.hpp:70</a></td><td>add an API to query a settings_pack as well</td></tr><tr id="40" style="display: none;" colspan="3"><td colspan="3"><h2>add an API to query a settings_pack as well</h2><h4>../include/libtorrent/settings_pack.hpp:70</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(41)">../include/libtorrent/settings_pack.hpp:71</a></td><td>maybe convert all bool types into int-types as well</td></tr><tr id="41" style="display: none;" colspan="3"><td colspan="3"><h2>maybe convert all bool types into int-types as well</h2><h4>../include/libtorrent/settings_pack.hpp:71</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(35)">../include/libtorrent/settings_pack.hpp:70</a></td><td>add an API to query a settings_pack as well</td></tr><tr id="35" style="display: none;" colspan="3"><td colspan="3"><h2>add an API to query a settings_pack as well</h2><h4>../include/libtorrent/settings_pack.hpp:70</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">{
 	namespace aux { struct session_impl; struct session_settings; }
 
 	struct settings_pack;
@@ -2049,7 +1791,7 @@ namespace libtorrent
 		{
 			string_type_base = 0x0000,
 			int_type_base =    0x4000,
-</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(42)">../include/libtorrent/socks5_stream.hpp:131</a></td><td>fix error messages to use custom error_code category</td></tr><tr id="42" style="display: none;" colspan="3"><td colspan="3"><h2>fix error messages to use custom error_code category</h2><h4>../include/libtorrent/socks5_stream.hpp:131</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(43)">../include/libtorrent/socks5_stream.hpp:132</a></td><td>add async_connect() that takes a hostname and port as well</td></tr><tr id="43" 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:132</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(36)">../include/libtorrent/socks5_stream.hpp:131</a></td><td>fix error messages to use custom error_code category</td></tr><tr id="36" style="display: none;" colspan="3"><td colspan="3"><h2>fix error messages to use custom error_code category</h2><h4>../include/libtorrent/socks5_stream.hpp:131</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(37)">../include/libtorrent/socks5_stream.hpp:132</a></td><td>add async_connect() that takes a hostname and port as well</td></tr><tr id="37" 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:132</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (m_dst_name.size() &gt; 255)
 			m_dst_name.resize(255);
 	}
 
@@ -2100,59 +1842,7 @@ namespace libtorrent
 		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(44)">../include/libtorrent/torrent_info.hpp:307</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="44" 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:307</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		bool resolving;
-
-		// if the user wanted to remove this while
-		// we were resolving it. In this case, we set
-		// the removed flag to true, to make the resolver
-		// callback remove it
-		bool removed;
-
-		// if the web server doesn't support keepalive or a block request was
-		// interrupted, the block received so far is kept here for the next
-		// connection to pick up
-		peer_request restart_request;
-		std::vector&lt;char&gt; restart_piece;
-	};
-
-#ifndef BOOST_NO_EXCEPTIONS
-	// for backwards compatibility with 0.14
-	typedef libtorrent_exception invalid_torrent_file;
-#endif
-
-<div style="background: #ffff00" width="100%">	class TORRENT_EXPORT torrent_info
-</div>	{
-	public:
-
-		// The constructor that takes an info-hash  will initialize the info-hash
-		// to the given value, but leave all other fields empty. This is used
-		// internally when downloading torrents without the metadata. The
-		// metadata will be created by libtorrent as soon as it has been
-		// downloaded from the swarm.
-		// 
-		// The constructor that takes a lazy_entry will create a torrent_info
-		// object from the information found in the given torrent_file. The
-		// lazy_entry represents a tree node in an bencoded file. To load an
-		// ordinary .torrent file into a lazy_entry, use lazy_bdecode().
-		// 
-		// The version that takes a buffer pointer and a size will decode it as a
-		// .torrent file and initialize the torrent_info object for you.
-		// 
-		// The version that takes a filename will simply load the torrent file
-		// and decode it inside the constructor, for convenience. This might not
-		// be the most suitable for applications that want to be able to report
-		// detailed errors on what might go wrong.
-		//
-		// There is an upper limit on the size of the torrent file that will be
-		// loaded by the overload taking a filename. If it's important that even
-		// very large torrent files are loaded, use one of the other overloads.
-		// 
-		// The overloads that takes an ``error_code const&amp;`` never throws if an
-		// 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: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(45)">../include/libtorrent/tracker_manager.hpp:269</a></td><td>this class probably doesn't need to have virtual functions.</td></tr><tr id="45" 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:269</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(38)">../include/libtorrent/tracker_manager.hpp:269</a></td><td>this class probably doesn't need to have virtual functions.</td></tr><tr id="38" 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:269</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		int m_completion_timeout;
 
 		typedef mutex mutex_t;
 		mutable mutex_t m_mutex;
@@ -2203,7 +1893,7 @@ specifically to turn some std::string and std::vector into pointers</h2><h4>../i
 
 		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(46)">../include/libtorrent/tracker_manager.hpp:366</a></td><td>this should be unique_ptr in the future</td></tr><tr id="46" style="display: none;" colspan="3"><td colspan="3"><h2>this should be unique_ptr in the future</h2><h4>../include/libtorrent/tracker_manager.hpp:366</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// this is only used for SOCKS packets, since
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(39)">../include/libtorrent/tracker_manager.hpp:366</a></td><td>this should be unique_ptr in the future</td></tr><tr id="39" style="display: none;" colspan="3"><td colspan="3"><h2>this should be unique_ptr in the future</h2><h4>../include/libtorrent/tracker_manager.hpp:366</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);
@@ -2242,7 +1932,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: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(47)">../include/libtorrent/aux_/session_interface.hpp:104</a></td><td>the IP voting mechanism should be factored out to its own class, not part of the session</td></tr><tr id="47" style="display: none;" colspan="3"><td colspan="3"><h2>the IP voting mechanism should be factored out
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(40)">../include/libtorrent/aux_/session_interface.hpp:104</a></td><td>the IP voting mechanism should be factored out to its own class, not part of the session</td></tr><tr id="40" 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:104</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	class port_filter;
 	struct settings_pack;
 	struct torrent_peer_allocator_interface;
@@ -2294,7 +1984,88 @@ namespace libtorrent { namespace aux
 		virtual void queue_async_resume_data(boost::shared_ptr&lt;torrent&gt; const&amp; t) = 0;
 		virtual void done_async_resume() = 0;
 		virtual void evict_torrent(torrent* t) = 0;
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(48)">../src/http_seed_connection.cpp:124</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="48" style="display: none;" colspan="3"><td colspan="3"><h2>in chunked encoding mode, this assert won't hold.
+</pre></td></tr><tr style="background: #cfc"><td>relevance&nbsp;2</td><td><a href="javascript:expand(41)">../include/libtorrent/aux_/session_settings.hpp:73</a></td><td>make this a bitfield</td></tr><tr id="41" style="display: none;" colspan="3"><td colspan="3"><h2>make this a bitfield</h2><h4>../include/libtorrent/aux_/session_settings.hpp:73</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 session_settings
+	{
+		friend void libtorrent::save_settings_to_dict(
+			aux::session_settings const&amp; s, entry::dictionary_type&amp; sett);
+
+		void set_str(int name, std::string const&amp; value) { SET(string); }
+		std::string const&amp; get_str(int name) const { GET(string, m_strings[0]); }
+		void set_int(int name, int value) { SET(int); }
+		int get_int(int name) const { GET(int, 0); }
+		void set_bool(int name, bool value) { SET(bool); }
+		bool get_bool(int name) const { GET(bool, false); }
+
+		session_settings() { initialize_default_settings(*this); }
+
+	private:
+		std::string m_strings[settings_pack::num_string_settings];
+		int m_ints[settings_pack::num_int_settings];
+<div style="background: #ffff00" width="100%">		bool m_bools[settings_pack::num_bool_settings];
+</div>	};
+
+#undef GET
+#undef SET
+
+} }
+
+#endif
+
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(42)">../src/disk_io_thread.cpp:233</a></td><td>it would be nice to have the number of threads be set dynamically</td></tr><tr id="42" 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:233</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
+
+#ifdef TORRENT_DISK_STATS
+		if (g_access_log)
+		{
+			FILE* f = g_access_log;
+			g_access_log = NULL;
+			fclose(f);
+		}
+#endif
+
+		TORRENT_ASSERT(m_magic == 0x1337);
+#if TORRENT_USE_ASSERTS
+		m_magic = 0xdead;
+#endif
+	}
+
+<div style="background: #ffff00" width="100%">	void disk_io_thread::set_num_threads(int i, bool wait)
+</div>	{
+		TORRENT_ASSERT(m_magic == 0x1337);
+		if (i == m_num_threads) return;
+
+		if (i &gt; m_num_threads)
+		{
+			while (m_num_threads &lt; i)
+			{
+				int thread_id = (++m_num_threads) - 1;
+				thread_type_t type = generic_thread;
+
+				// the magic number 3 is also used in add_job()
+				// every 4:th thread is a hasher thread
+				if ((thread_id &amp; 0x3) == 3) type = hasher_thread;
+				m_threads.push_back(boost::shared_ptr&lt;thread&gt;(
+					new thread(boost::bind(&amp;disk_io_thread::thread_fun, this, thread_id, type))));
+			}
+		}
+		else
+		{
+			while (m_num_threads &gt; i) { --m_num_threads; }
+			mutex::scoped_lock l(m_job_mutex);
+			m_job_cond.notify_all();
+			m_hash_job_cond.notify_all();
+			l.unlock();
+			if (wait) for (int i = m_num_threads; i &lt; m_threads.size(); ++i) m_threads[i]-&gt;join();
+			// this will detach the threads
+			m_threads.resize(m_num_threads);
+		}
+	}
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(43)">../src/http_seed_connection.cpp:124</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="43" 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:124</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	boost::optional&lt;piece_block_progress&gt;
 	http_seed_connection::downloading_piece_progress() const
 	{
@@ -2346,8 +2117,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(49)">../src/session_impl.cpp:5163</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="49" 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:5163</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(44)">../src/session_impl.cpp:5166</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="44" 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:5166</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());
@@ -2394,9 +2165,9 @@ this understanding of our external address, instead of the empty address</h2><h4
 		}
 	}
 
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(50)">../src/session_impl.cpp:6325</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="50" 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(45)">../src/session_impl.cpp:6326</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="45" 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:6325</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:6326</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#endif
 
 		if (!m_external_ip.cast_vote(ip, source_type, source)) return;
 
@@ -2447,11 +2218,11 @@ 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(51)">../src/torrent.cpp:1128</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="51" 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(46)">../src/torrent.cpp:1156</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="46" style="display: none;" colspan="3"><td colspan="3"><h2>make this depend on the error and on the filesystem the
 files are being downloaded to. If the error is no_space_left_on_device
 and the filesystem doesn't support sparse files, only zero the priorities
 of the pieces that are at the tails of all files, leaving everything
-up to the highest written piece in each file</h2><h4>../src/torrent.cpp:1128</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			alerts().post_alert(file_error_alert(j-&gt;error.ec
+up to the highest written piece in each file</h2><h4>../src/torrent.cpp:1156</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			alerts().post_alert(file_error_alert(j-&gt;error.ec
 				, resolve_filename(j-&gt;error.file), j-&gt;error.operation_str(), get_handle()));
 
 		// put the torrent in an error-state
@@ -2502,8 +2273,8 @@ up to the highest written piece in each file</h2><h4>../src/torrent.cpp:1128</h4
 				p-&gt;send_block_requests();
 			}
 		}
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(52)">../src/torrent.cpp:6831</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="52" 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:6831</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					for (int k = 0; k &lt; bits; ++k)
+</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(47)">../src/torrent.cpp:6865</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="47" 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:6865</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					for (int k = 0; k &lt; bits; ++k)
 						v |= (i-&gt;info[j*8+k].state == piece_picker::block_info::state_finished)
 						? (1 &lt;&lt; k) : 0;
 					bitmask.append(1, v);
@@ -2541,7 +2312,7 @@ it may pose an issue when downgrading though</h2><h4>../src/torrent.cpp:6831</h4
 		{
 			entry::list_type&amp; url_list = ret["url-list"].list();
 			entry::list_type&amp; httpseed_list = ret["httpseeds"].list();
-			for (std::list&lt;web_seed_entry&gt;::const_iterator i = m_web_seeds.begin()
+			for (std::list&lt;web_seed_t&gt;::const_iterator i = m_web_seeds.begin()
 				, end(m_web_seeds.end()); i != end; ++i)
 			{
 				if (i-&gt;type == web_seed_entry::url_seed)
@@ -2554,9 +2325,9 @@ it may pose an issue when downgrading though</h2><h4>../src/torrent.cpp:6831</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(53)">../src/torrent.cpp:7924</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="53" 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(48)">../src/torrent.cpp:7958</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="48" 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:7924</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		set_state(torrent_status::finished);
+for all peers though</h2><h4>../src/torrent.cpp:7958</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		set_state(torrent_status::finished);
 		set_queue_position(-1);
 
 		m_became_finished = m_ses.session_time();
@@ -2607,7 +2378,7 @@ for all peers though</h2><h4>../src/torrent.cpp:7924</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(54)">../include/libtorrent/ip_voter.hpp:122</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="54" 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:122</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(49)">../include/libtorrent/ip_voter.hpp:122</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="49" 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:122</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// away all the votes and started from scratch, in case
 		// our IP has changed
 		ptime m_last_rotate;
 	};
@@ -2634,7 +2405,7 @@ for all peers though</h2><h4>../src/torrent.cpp:7924</h4><pre style="background:
 
 #endif
 
-</pre></td></tr><tr style="background: #ccf"><td>relevance&nbsp;1</td><td><a href="javascript:expand(55)">../include/libtorrent/web_peer_connection.hpp:121</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="55" 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(50)">../include/libtorrent/web_peer_connection.hpp:121</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="50" 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:121</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// returns the block currently being
@@ -2652,7 +2423,7 @@ use allocate_disk_receive_buffer and release_disk_receive_buffer</h2><h4>../incl
 
 		std::string m_url;
 	
-		web_seed_entry* m_web;
+		web_seed_t* m_web;
 			
 		// this is used for intermediate storage of pieces
 		// that are received in more than one HTTP response
@@ -2687,7 +2458,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(56)">../test/test_block_cache.cpp:475</a></td><td>test try_evict_blocks</td></tr><tr id="56" style="display: none;" colspan="3"><td colspan="3"><h2>test try_evict_blocks</h2><h4>../test/test_block_cache.cpp:475</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(57)">../test/test_block_cache.cpp:476</a></td><td>test evicting volatile pieces, to see them be removed</td></tr><tr id="57" 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:476</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(58)">../test/test_block_cache.cpp:477</a></td><td>test evicting dirty pieces</td></tr><tr id="58" style="display: none;" colspan="3"><td colspan="3"><h2>test evicting dirty pieces</h2><h4>../test/test_block_cache.cpp:477</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(59)">../test/test_block_cache.cpp:478</a></td><td>test free_piece</td></tr><tr id="59" style="display: none;" colspan="3"><td colspan="3"><h2>test free_piece</h2><h4>../test/test_block_cache.cpp:478</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(60)">../test/test_block_cache.cpp:479</a></td><td>test abort_dirty</td></tr><tr id="60" style="display: none;" colspan="3"><td colspan="3"><h2>test abort_dirty</h2><h4>../test/test_block_cache.cpp:479</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(61)">../test/test_block_cache.cpp:480</a></td><td>test unaligned reads</td></tr><tr id="61" style="display: none;" colspan="3"><td colspan="3"><h2>test unaligned reads</h2><h4>../test/test_block_cache.cpp:480</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(51)">../test/test_block_cache.cpp:475</a></td><td>test try_evict_blocks</td></tr><tr id="51" style="display: none;" colspan="3"><td colspan="3"><h2>test try_evict_blocks</h2><h4>../test/test_block_cache.cpp:475</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(52)">../test/test_block_cache.cpp:476</a></td><td>test evicting volatile pieces, to see them be removed</td></tr><tr id="52" 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:476</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(53)">../test/test_block_cache.cpp:477</a></td><td>test evicting dirty pieces</td></tr><tr id="53" style="display: none;" colspan="3"><td colspan="3"><h2>test evicting dirty pieces</h2><h4>../test/test_block_cache.cpp:477</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(54)">../test/test_block_cache.cpp:478</a></td><td>test free_piece</td></tr><tr id="54" style="display: none;" colspan="3"><td colspan="3"><h2>test free_piece</h2><h4>../test/test_block_cache.cpp:478</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(55)">../test/test_block_cache.cpp:479</a></td><td>test abort_dirty</td></tr><tr id="55" style="display: none;" colspan="3"><td colspan="3"><h2>test abort_dirty</h2><h4>../test/test_block_cache.cpp:479</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(56)">../test/test_block_cache.cpp:480</a></td><td>test unaligned reads</td></tr><tr id="56" style="display: none;" colspan="3"><td colspan="3"><h2>test unaligned reads</h2><h4>../test/test_block_cache.cpp:480</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;
@@ -2710,7 +2481,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(62)">../test/test_metadata_extension.cpp:87</a></td><td>it would be nice to test reversing which session is making the connection as well</td></tr><tr id="62" 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(57)">../test/test_metadata_extension.cpp:87</a></td><td>it would be nice to test reversing which session is making the connection as well</td></tr><tr id="57" 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:87</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	, boost::shared_ptr&lt;libtorrent::torrent_plugin&gt; (*constructor)(libtorrent::torrent*, void*)
 	, int timeout)
 {
@@ -2762,7 +2533,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(63)">../test/test_peer_list.cpp:419</a></td><td>test applying a port_filter</td></tr><tr id="63" style="display: none;" colspan="3"><td colspan="3"><h2>test applying a port_filter</h2><h4>../test/test_peer_list.cpp:419</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(64)">../test/test_peer_list.cpp:420</a></td><td>test erasing peers</td></tr><tr id="64" style="display: none;" colspan="3"><td colspan="3"><h2>test erasing peers</h2><h4>../test/test_peer_list.cpp:420</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(65)">../test/test_peer_list.cpp:421</a></td><td>test using port and ip filter</td></tr><tr id="65" style="display: none;" colspan="3"><td colspan="3"><h2>test using port and ip filter</h2><h4>../test/test_peer_list.cpp:421</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_peer_list.cpp:422</a></td><td>test incrementing failcount (and make sure we no longer consider the peer a connect canidate)</td></tr><tr id="66" style="display: none;" colspan="3"><td colspan="3"><h2>test incrementing failcount (and make sure we no longer consider the peer a connect canidate)</h2><h4>../test/test_peer_list.cpp:422</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_peer_list.cpp:423</a></td><td>test max peerlist size</td></tr><tr id="67" style="display: none;" colspan="3"><td colspan="3"><h2>test max peerlist size</h2><h4>../test/test_peer_list.cpp:423</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_peer_list.cpp:424</a></td><td>test logic for which connection to keep when receiving an incoming connection to the same peer as we just made an outgoing connection to</td></tr><tr id="68" style="display: none;" colspan="3"><td colspan="3"><h2>test logic for which connection to keep when receiving an incoming connection to the same peer as we just made an outgoing connection to</h2><h4>../test/test_peer_list.cpp:424</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_peer_list.cpp:425</a></td><td>test update_peer_port with allow_multiple_connections_per_ip</td></tr><tr id="69" style="display: none;" colspan="3"><td colspan="3"><h2>test update_peer_port with allow_multiple_connections_per_ip</h2><h4>../test/test_peer_list.cpp:425</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_peer_list.cpp:426</a></td><td>test set_seed</td></tr><tr id="70" style="display: none;" colspan="3"><td colspan="3"><h2>test set_seed</h2><h4>../test/test_peer_list.cpp:426</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_peer_list.cpp:427</a></td><td>test has_peer</td></tr><tr id="71" style="display: none;" colspan="3"><td colspan="3"><h2>test has_peer</h2><h4>../test/test_peer_list.cpp:427</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_peer_list.cpp:428</a></td><td>test insert_peer with a full list</td></tr><tr id="72" style="display: none;" colspan="3"><td colspan="3"><h2>test insert_peer with a full list</h2><h4>../test/test_peer_list.cpp:428</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_peer_list.cpp:429</a></td><td>test add i2p peers</td></tr><tr id="73" style="display: none;" colspan="3"><td colspan="3"><h2>test add i2p peers</h2><h4>../test/test_peer_list.cpp:429</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_peer_list.cpp:430</a></td><td>test allow_i2p_mixed</td></tr><tr id="74" style="display: none;" colspan="3"><td colspan="3"><h2>test allow_i2p_mixed</h2><h4>../test/test_peer_list.cpp:430</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_peer_list.cpp:431</a></td><td>test insert_peer failing</td></tr><tr id="75" style="display: none;" colspan="3"><td colspan="3"><h2>test insert_peer failing</h2><h4>../test/test_peer_list.cpp:431</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_peer_list.cpp:432</a></td><td>test IPv6</td></tr><tr id="76" style="display: none;" colspan="3"><td colspan="3"><h2>test IPv6</h2><h4>../test/test_peer_list.cpp:432</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_peer_list.cpp:433</a></td><td>test connect_to_peer() failing</td></tr><tr id="77" style="display: none;" colspan="3"><td colspan="3"><h2>test connect_to_peer() failing</h2><h4>../test/test_peer_list.cpp:433</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_peer_list.cpp:434</a></td><td>test connection_closed</td></tr><tr id="78" style="display: none;" colspan="3"><td colspan="3"><h2>test connection_closed</h2><h4>../test/test_peer_list.cpp:434</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_peer_list.cpp:435</a></td><td>test recalculate connect candidates</td></tr><tr id="79" style="display: none;" colspan="3"><td colspan="3"><h2>test recalculate connect candidates</h2><h4>../test/test_peer_list.cpp:435</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_peer_list.cpp:436</a></td><td>add tests here</td></tr><tr id="80" style="display: none;" colspan="3"><td colspan="3"><h2>add tests here</h2><h4>../test/test_peer_list.cpp:436</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		for (int i = 0; i &lt; 100; ++i)
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(58)">../test/test_peer_list.cpp:419</a></td><td>test applying a port_filter</td></tr><tr id="58" style="display: none;" colspan="3"><td colspan="3"><h2>test applying a port_filter</h2><h4>../test/test_peer_list.cpp:419</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(59)">../test/test_peer_list.cpp:420</a></td><td>test erasing peers</td></tr><tr id="59" style="display: none;" colspan="3"><td colspan="3"><h2>test erasing peers</h2><h4>../test/test_peer_list.cpp:420</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(60)">../test/test_peer_list.cpp:421</a></td><td>test using port and ip filter</td></tr><tr id="60" style="display: none;" colspan="3"><td colspan="3"><h2>test using port and ip filter</h2><h4>../test/test_peer_list.cpp:421</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(61)">../test/test_peer_list.cpp:422</a></td><td>test incrementing failcount (and make sure we no longer consider the peer a connect canidate)</td></tr><tr id="61" style="display: none;" colspan="3"><td colspan="3"><h2>test incrementing failcount (and make sure we no longer consider the peer a connect canidate)</h2><h4>../test/test_peer_list.cpp:422</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(62)">../test/test_peer_list.cpp:423</a></td><td>test max peerlist size</td></tr><tr id="62" style="display: none;" colspan="3"><td colspan="3"><h2>test max peerlist size</h2><h4>../test/test_peer_list.cpp:423</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(63)">../test/test_peer_list.cpp:424</a></td><td>test logic for which connection to keep when receiving an incoming connection to the same peer as we just made an outgoing connection to</td></tr><tr id="63" style="display: none;" colspan="3"><td colspan="3"><h2>test logic for which connection to keep when receiving an incoming connection to the same peer as we just made an outgoing connection to</h2><h4>../test/test_peer_list.cpp:424</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(64)">../test/test_peer_list.cpp:425</a></td><td>test update_peer_port with allow_multiple_connections_per_ip</td></tr><tr id="64" style="display: none;" colspan="3"><td colspan="3"><h2>test update_peer_port with allow_multiple_connections_per_ip</h2><h4>../test/test_peer_list.cpp:425</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(65)">../test/test_peer_list.cpp:426</a></td><td>test set_seed</td></tr><tr id="65" style="display: none;" colspan="3"><td colspan="3"><h2>test set_seed</h2><h4>../test/test_peer_list.cpp:426</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_peer_list.cpp:427</a></td><td>test has_peer</td></tr><tr id="66" style="display: none;" colspan="3"><td colspan="3"><h2>test has_peer</h2><h4>../test/test_peer_list.cpp:427</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_peer_list.cpp:428</a></td><td>test insert_peer with a full list</td></tr><tr id="67" style="display: none;" colspan="3"><td colspan="3"><h2>test insert_peer with a full list</h2><h4>../test/test_peer_list.cpp:428</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_peer_list.cpp:429</a></td><td>test add i2p peers</td></tr><tr id="68" style="display: none;" colspan="3"><td colspan="3"><h2>test add i2p peers</h2><h4>../test/test_peer_list.cpp:429</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_peer_list.cpp:430</a></td><td>test allow_i2p_mixed</td></tr><tr id="69" style="display: none;" colspan="3"><td colspan="3"><h2>test allow_i2p_mixed</h2><h4>../test/test_peer_list.cpp:430</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_peer_list.cpp:431</a></td><td>test insert_peer failing</td></tr><tr id="70" style="display: none;" colspan="3"><td colspan="3"><h2>test insert_peer failing</h2><h4>../test/test_peer_list.cpp:431</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_peer_list.cpp:432</a></td><td>test IPv6</td></tr><tr id="71" style="display: none;" colspan="3"><td colspan="3"><h2>test IPv6</h2><h4>../test/test_peer_list.cpp:432</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_peer_list.cpp:433</a></td><td>test connect_to_peer() failing</td></tr><tr id="72" style="display: none;" colspan="3"><td colspan="3"><h2>test connect_to_peer() failing</h2><h4>../test/test_peer_list.cpp:433</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_peer_list.cpp:434</a></td><td>test connection_closed</td></tr><tr id="73" style="display: none;" colspan="3"><td colspan="3"><h2>test connection_closed</h2><h4>../test/test_peer_list.cpp:434</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_peer_list.cpp:435</a></td><td>test recalculate connect candidates</td></tr><tr id="74" style="display: none;" colspan="3"><td colspan="3"><h2>test recalculate connect candidates</h2><h4>../test/test_peer_list.cpp:435</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_peer_list.cpp:436</a></td><td>add tests here</td></tr><tr id="75" style="display: none;" colspan="3"><td colspan="3"><h2>add tests here</h2><h4>../test/test_peer_list.cpp:436</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		for (int i = 0; i &lt; 100; ++i)
 		{
 			torrent_peer* peer = p.add_peer(rand_tcp_ep(), 0, 0, &amp;st);
 			TEST_EQUAL(st.erased.size(), 0);
@@ -2786,7 +2557,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(81)">../test/test_primitives.cpp:213</a></td><td>test the case where we have > 120 samples (and have the base delay actually be updated)</td></tr><tr id="81" 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: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(82)">../test/test_primitives.cpp:214</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="82" 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:214</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(76)">../test/test_primitives.cpp:213</a></td><td>test the case where we have > 120 samples (and have the base delay actually be updated)</td></tr><tr id="76" 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: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(77)">../test/test_primitives.cpp:214</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="77" 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:214</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TEST_CHECK(!filter.find(k3));
 	TEST_CHECK(filter.find(k4));
 
 	// test timestamp_history
@@ -2837,7 +2608,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(83)">../test/test_rss.cpp:136</a></td><td>verify some key state is saved in 'state'</td></tr><tr id="83" style="display: none;" colspan="3"><td colspan="3"><h2>verify some key state is saved in 'state'</h2><h4>../test/test_rss.cpp:136</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	feed_status st;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(78)">../test/test_rss.cpp:135</a></td><td>verify some key state is saved in 'state'</td></tr><tr id="78" style="display: none;" colspan="3"><td colspan="3"><h2>verify some key state is saved in 'state'</h2><h4>../test/test_rss.cpp:135</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	feed_status st;
 	f-&gt;get_feed_status(&amp;st);
 	TEST_CHECK(!st.error);
 
@@ -2872,7 +2643,7 @@ int test_main()
 	return 0;
 }
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(84)">../test/test_ssl.cpp:377</a></td><td>test using a signed certificate with the wrong info-hash in DN</td></tr><tr id="84" 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(79)">../test/test_ssl.cpp:377</a></td><td>test using a signed certificate with the wrong info-hash in DN</td></tr><tr id="79" 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
 	ctx.set_verify_mode(context::verify_none, ec);
 	if (ec)
 	{
@@ -2923,7 +2694,7 @@ int test_main()
 			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(85)">../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="85" style="display: none;" colspan="3"><td colspan="3"><h2>also test using a hash that refers to a valid torrent
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(80)">../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="80" 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);
 	if (ec)
 	{
@@ -2975,7 +2746,7 @@ but that differs from the SNI hash</h2><h4>../test/test_ssl.cpp:475</h4><pre sty
 		return false;
 	}
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(86)">../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="86" 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(81)">../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="81" 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);
@@ -3026,7 +2797,7 @@ but that differs from the SNI hash</h2><h4>../test/test_ssl.cpp:475</h4><pre sty
 }
 
 int test_main()
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(87)">../test/test_torrent_parse.cpp:116</a></td><td>test remap_files</td></tr><tr id="87" style="display: none;" colspan="3"><td colspan="3"><h2>test remap_files</h2><h4>../test/test_torrent_parse.cpp:116</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_torrent_parse.cpp:117</a></td><td>merkle torrents. specifically torrent_info::add_merkle_nodes and torrent with "root hash"</td></tr><tr id="88" 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_parse.cpp:117</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_torrent_parse.cpp:118</a></td><td>torrent with 'p' (padfile) attribute</td></tr><tr id="89" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'p' (padfile) attribute</h2><h4>../test/test_torrent_parse.cpp:118</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_torrent_parse.cpp:119</a></td><td>torrent with 'h' (hidden) attribute</td></tr><tr id="90" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'h' (hidden) attribute</h2><h4>../test/test_torrent_parse.cpp:119</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_torrent_parse.cpp:120</a></td><td>torrent with 'x' (executable) attribute</td></tr><tr id="91" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'x' (executable) attribute</h2><h4>../test/test_torrent_parse.cpp:120</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(92)">../test/test_torrent_parse.cpp:121</a></td><td>torrent with 'l' (symlink) attribute</td></tr><tr id="92" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'l' (symlink) attribute</h2><h4>../test/test_torrent_parse.cpp:121</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_torrent_parse.cpp:122</a></td><td>creating a merkle torrent (torrent_info::build_merkle_list)</td></tr><tr id="93" style="display: none;" colspan="3"><td colspan="3"><h2>creating a merkle torrent (torrent_info::build_merkle_list)</h2><h4>../test/test_torrent_parse.cpp:122</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(94)">../test/test_torrent_parse.cpp:123</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="94" 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_parse.cpp:123</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(82)">../test/test_torrent_parse.cpp:116</a></td><td>test remap_files</td></tr><tr id="82" style="display: none;" colspan="3"><td colspan="3"><h2>test remap_files</h2><h4>../test/test_torrent_parse.cpp:116</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_torrent_parse.cpp:117</a></td><td>merkle torrents. specifically torrent_info::add_merkle_nodes and torrent with "root hash"</td></tr><tr id="83" 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_parse.cpp:117</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_torrent_parse.cpp:118</a></td><td>torrent with 'p' (padfile) attribute</td></tr><tr id="84" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'p' (padfile) attribute</h2><h4>../test/test_torrent_parse.cpp:118</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_torrent_parse.cpp:119</a></td><td>torrent with 'h' (hidden) attribute</td></tr><tr id="85" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'h' (hidden) attribute</h2><h4>../test/test_torrent_parse.cpp:119</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_torrent_parse.cpp:120</a></td><td>torrent with 'x' (executable) attribute</td></tr><tr id="86" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'x' (executable) attribute</h2><h4>../test/test_torrent_parse.cpp:120</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_torrent_parse.cpp:121</a></td><td>torrent with 'l' (symlink) attribute</td></tr><tr id="87" style="display: none;" colspan="3"><td colspan="3"><h2>torrent with 'l' (symlink) attribute</h2><h4>../test/test_torrent_parse.cpp:121</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_torrent_parse.cpp:122</a></td><td>creating a merkle torrent (torrent_info::build_merkle_list)</td></tr><tr id="88" style="display: none;" colspan="3"><td colspan="3"><h2>creating a merkle torrent (torrent_info::build_merkle_list)</h2><h4>../test/test_torrent_parse.cpp:122</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_torrent_parse.cpp:123</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="89" 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_parse.cpp:123</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_file_parse_failed },
@@ -3077,7 +2848,7 @@ namespace libtorrent
 	TEST_EQUAL(merkle_num_leafs(15), 16);
 	TEST_EQUAL(merkle_num_leafs(16), 16);
 	TEST_EQUAL(merkle_num_leafs(17), 32);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(95)">../test/test_tracker.cpp:198</a></td><td>test parse peers6</td></tr><tr id="95" 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(96)">../test/test_tracker.cpp:199</a></td><td>test parse tracker-id</td></tr><tr id="96" 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(97)">../test/test_tracker.cpp:200</a></td><td>test parse failure-reason</td></tr><tr id="97" 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(98)">../test/test_tracker.cpp:201</a></td><td>test all failure paths 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="98" style="display: none;" colspan="3"><td colspan="3"><h2>test all failure paths
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(90)">../test/test_tracker.cpp:198</a></td><td>test parse peers6</td></tr><tr id="90" 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(91)">../test/test_tracker.cpp:199</a></td><td>test parse tracker-id</td></tr><tr id="91" 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(92)">../test/test_tracker.cpp:200</a></td><td>test parse failure-reason</td></tr><tr id="92" 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(93)">../test/test_tracker.cpp:201</a></td><td>test all failure paths 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="93" style="display: none;" colspan="3"><td colspan="3"><h2>test all failure paths
 invalid bencoding
 not a dictionary
 no files entry in scrape response
@@ -3134,7 +2905,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(99)">../test/test_upnp.cpp:100</a></td><td>store the log and verify that some key messages are there</td></tr><tr id="99" 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(94)">../test/test_upnp.cpp:100</a></td><td>store the log and verify that some key messages are there</td></tr><tr id="94" 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"
@@ -3185,7 +2956,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(100)">../test/web_seed_suite.cpp:374</a></td><td>file hashes don't work with the new torrent creator reading async</td></tr><tr id="100" 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:374</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(95)">../test/web_seed_suite.cpp:374</a></td><td>file hashes don't work with the new torrent creator reading async</td></tr><tr id="95" 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:374</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]));
@@ -3236,7 +3007,7 @@ int run_upnp_test(char const* root_filename, char const* router_model, char cons
 			, chunked_encoding, test_ban, keepalive);
 		
 		if (test_url_seed &amp;&amp; test_rename)
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(101)">../src/block_cache.cpp:884</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="101" 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(96)">../src/block_cache.cpp:884</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="96" 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:884</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	}
@@ -3290,7 +3061,7 @@ weren't in this list</h2><h4>../src/block_cache.cpp:884</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(102)">../src/block_cache.cpp:948</a></td><td>this should probably only be done every n:th time</td></tr><tr id="102" 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:948</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(97)">../src/block_cache.cpp:948</a></td><td>this should probably only be done every n:th time</td></tr><tr id="97" 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:948</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			}
 
 			if (pe-&gt;ok_to_evict())
 			{
@@ -3341,7 +3112,7 @@ weren't in this list</h2><h4>../src/block_cache.cpp:884</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(103)">../src/block_cache.cpp:1720</a></td><td>create a holder for refcounts that automatically decrement</td></tr><tr id="103" style="display: none;" colspan="3"><td colspan="3"><h2>create a holder for refcounts that automatically decrement</h2><h4>../src/block_cache.cpp:1720</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(98)">../src/block_cache.cpp:1720</a></td><td>create a holder for refcounts that automatically decrement</td></tr><tr id="98" style="display: none;" colspan="3"><td colspan="3"><h2>create a holder for refcounts that automatically decrement</h2><h4>../src/block_cache.cpp:1720</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	}
 
 	j-&gt;buffer = allocate_buffer("send buffer");
 	if (j-&gt;buffer == 0) return -2;
@@ -3392,7 +3163,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(104)">../src/bt_peer_connection.cpp:663</a></td><td>this could be optimized using knuth morris pratt</td></tr><tr id="104" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized using knuth morris pratt</h2><h4>../src/bt_peer_connection.cpp:663</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)">../src/bt_peer_connection.cpp:663</a></td><td>this could be optimized using knuth morris pratt</td></tr><tr id="99" style="display: none;" colspan="3"><td colspan="3"><h2>this could be optimized using knuth morris pratt</h2><h4>../src/bt_peer_connection.cpp:663</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
 			disconnect(errors::no_memory, op_encryption);
 			return;
 		}
@@ -3443,7 +3214,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(105)">../src/bt_peer_connection.cpp:2204</a></td><td>if we're finished, send upload_only message</td></tr><tr id="105" style="display: none;" colspan="3"><td colspan="3"><h2>if we're finished, send upload_only message</h2><h4>../src/bt_peer_connection.cpp:2204</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (msg[5 + k / 8] &amp; (0x80 &gt;&gt; (k % 8))) bitfield_string[k] = '1';
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(100)">../src/bt_peer_connection.cpp:2204</a></td><td>if we're finished, send upload_only message</td></tr><tr id="100" style="display: none;" colspan="3"><td colspan="3"><h2>if we're finished, send upload_only message</h2><h4>../src/bt_peer_connection.cpp:2204</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (msg[5 + k / 8] &amp; (0x80 &gt;&gt; (k % 8))) bitfield_string[k] = '1';
 			else bitfield_string[k] = '0';
 		}
 		peer_log("==&gt; BITFIELD [ %s ]", bitfield_string.c_str());
@@ -3494,7 +3265,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(106)">../src/choker.cpp:332</a></td><td>optimize this using partial_sort or something. We don't need to sort the entire list</td></tr><tr id="106" 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(101)">../src/choker.cpp:332</a></td><td>optimize this using partial_sort or something. We don't need to sort the entire list</td></tr><tr id="101" 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:332</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			return upload_slots;
 		}
 
@@ -3516,7 +3287,7 @@ to sort the entire list</h2><h4>../src/choker.cpp:332</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(107)">../src/choker.cpp:335</a></td><td>make the comparison function a free function and move it into this cpp file</td></tr><tr id="107" 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(102)">../src/choker.cpp:335</a></td><td>make the comparison function a free function and move it into this cpp file</td></tr><tr id="102" 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:335</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		}
 
 		// ==== rate-based ====
@@ -3540,7 +3311,7 @@ into this cpp file</h2><h4>../src/choker.cpp:335</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(108)">../src/choker.cpp:340</a></td><td>make configurable</td></tr><tr id="108" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/choker.cpp:340</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)">../src/choker.cpp:340</a></td><td>make configurable</td></tr><tr id="103" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/choker.cpp:340</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
@@ -3573,7 +3344,7 @@ into this cpp file</h2><h4>../src/choker.cpp:335</h4><pre style="background: #f6
 
 				++upload_slots;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(109)">../src/choker.cpp:354</a></td><td>make configurable</td></tr><tr id="109" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/choker.cpp:354</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(104)">../src/choker.cpp:354</a></td><td>make configurable</td></tr><tr id="104" style="display: none;" colspan="3"><td colspan="3"><h2>make configurable</h2><h4>../src/choker.cpp:354</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// it purely based on the current state of our peers.
 			upload_slots = 0;
 
 			
@@ -3624,7 +3395,7 @@ into this cpp file</h2><h4>../src/choker.cpp:335</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(110)">../src/disk_io_thread.cpp:912</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="110" 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(105)">../src/disk_io_thread.cpp:912</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="105" 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:912</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)
@@ -3676,7 +3447,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(111)">../src/disk_io_thread.cpp:1123</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="111" 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(106)">../src/disk_io_thread.cpp:1123</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="106" 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:1123</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
@@ -3723,7 +3494,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(112)">../src/disk_io_thread.cpp:1151</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="112" 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(107)">../src/disk_io_thread.cpp:1151</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="107" 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:1151</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		ptime start_time = time_now_hires();
@@ -3756,7 +3527,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(113)">../src/disk_io_thread.cpp:1165</a></td><td>it should clear the hash state even when there's an error, right?</td></tr><tr id="113" 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:1165</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(108)">../src/disk_io_thread.cpp:1165</a></td><td>it should clear the hash state even when there's an error, right?</td></tr><tr id="108" 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:1165</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)
 		{
@@ -3807,7 +3578,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(114)">../src/disk_io_thread.cpp:1860</a></td><td>maybe the tailqueue_iterator should contain a pointer-pointer instead and have an unlink function</td></tr><tr id="114" 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(109)">../src/disk_io_thread.cpp:1860</a></td><td>maybe the tailqueue_iterator should contain a pointer-pointer instead and have an unlink function</td></tr><tr id="109" 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:1860</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		j-&gt;callback = handler;
 
 		add_fence_job(storage, j);
@@ -3859,7 +3630,7 @@ instead and have an unlink function</h2><h4>../src/disk_io_thread.cpp:1860</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(115)">../src/disk_io_thread.cpp:2115</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="115" 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(110)">../src/disk_io_thread.cpp:2115</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="110" 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:2115</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	}
 
 	void disk_io_thread::async_clear_piece(piece_manager* storage, int index
@@ -3911,7 +3682,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(116)">../src/disk_io_thread.cpp:2376</a></td><td>we should probably just hang the job on the piece and make sure the hasher gets kicked</td></tr><tr id="116" 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:2376</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(111)">../src/disk_io_thread.cpp:2376</a></td><td>we should probably just hang the job on the piece and make sure the hasher gets kicked</td></tr><tr id="111" 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:2376</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
@@ -3962,7 +3733,7 @@ it would be to have a fence for just this one piece.</h2><h4>../src/disk_io_thre
 
 		// increment the refcounts of all
 		// blocks up front, and then hash them without holding the lock
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(117)">../src/disk_io_thread.cpp:2446</a></td><td>introduce a holder class that automatically increments and decrements the piece_refcount</td></tr><tr id="117" 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(112)">../src/disk_io_thread.cpp:2446</a></td><td>introduce a holder class that automatically increments and decrements the piece_refcount</td></tr><tr id="112" 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:2446</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		for (int i = ph-&gt;offset / block_size; i &lt; blocks_in_piece; ++i)
 		{
 			iov.iov_len = (std::min)(block_size, piece_size - ph-&gt;offset);
@@ -4014,7 +3785,7 @@ and decrements the piece_refcount</h2><h4>../src/disk_io_thread.cpp:2446</h4><pr
 					l.lock();
 					break;
 				}
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(118)">../src/disk_io_thread.cpp:2688</a></td><td>it would be nice to not have to lock the mutex every turn through this loop</td></tr><tr id="118" 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(113)">../src/disk_io_thread.cpp:2688</a></td><td>it would be nice to not have to lock the mutex every turn through this loop</td></tr><tr id="113" 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:2688</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;
@@ -4066,7 +3837,7 @@ turn through this loop</h2><h4>../src/disk_io_thread.cpp:2688</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(119)">../src/http_tracker_connection.cpp:93</a></td><td>support authentication (i.e. user name and password) in the URL</td></tr><tr id="119" style="display: none;" colspan="3"><td colspan="3"><h2>support authentication (i.e. user name and password) in the URL</h2><h4>../src/http_tracker_connection.cpp:93</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)">../src/http_tracker_connection.cpp:93</a></td><td>support authentication (i.e. user name and password) in the URL</td></tr><tr id="114" style="display: none;" colspan="3"><td colspan="3"><h2>support authentication (i.e. user name and password) in the URL</h2><h4>../src/http_tracker_connection.cpp:93</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 	http_tracker_connection::http_tracker_connection(
 		io_service&amp; ios
 		, tracker_manager&amp; man
@@ -4117,7 +3888,7 @@ turn through this loop</h2><h4>../src/disk_io_thread.cpp:2688</h4><pre style="ba
 		if (arguments_start != std::string::npos)
 			url += "&amp;";
 		else
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(120)">../src/http_tracker_connection.cpp:194</a></td><td>support this somehow</td></tr><tr id="120" style="display: none;" colspan="3"><td colspan="3"><h2>support this somehow</h2><h4>../src/http_tracker_connection.cpp:194</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(115)">../src/http_tracker_connection.cpp:194</a></td><td>support this somehow</td></tr><tr id="115" style="display: none;" colspan="3"><td colspan="3"><h2>support this somehow</h2><h4>../src/http_tracker_connection.cpp:194</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				url += escape_string(id.c_str(), id.length());
 			}
 
 #if TORRENT_USE_I2P
@@ -4168,7 +3939,7 @@ turn through this loop</h2><h4>../src/disk_io_thread.cpp:2688</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(121)">../src/lsd.cpp:84</a></td><td>instead if writing to a file, post alerts. Or call a log callback</td></tr><tr id="121" style="display: none;" colspan="3"><td colspan="3"><h2>instead if writing to a file, post alerts. Or call a log callback</h2><h4>../src/lsd.cpp:84</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)">../src/lsd.cpp:84</a></td><td>instead if writing to a file, post alerts. Or call a log callback</td></tr><tr id="116" style="display: none;" colspan="3"><td colspan="3"><h2>instead if writing to a file, post alerts. Or call a log callback</h2><h4>../src/lsd.cpp:84</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">}
 
 static error_code ec;
 
@@ -4219,7 +3990,7 @@ lsd::lsd(io_service&amp; ios, peer_callback_t const&amp; cb)
 #endif
 }
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(122)">../src/metadata_transfer.cpp:359</a></td><td>this is not safe. The torrent could be unloaded while we're still sending the metadata</td></tr><tr id="122" 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(117)">../src/metadata_transfer.cpp:359</a></td><td>this is not safe. The torrent could be unloaded while we're still sending the metadata</td></tr><tr id="117" 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:359</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				std::pair&lt;int, int&gt; offset
 					= req_to_offset(req, (int)m_tp.metadata().left());
 
@@ -4271,7 +4042,7 @@ we're still sending the metadata</h2><h4>../src/metadata_transfer.cpp:359</h4><p
 
 			if (length &gt; 500 * 1024)
 			{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(123)">../src/packet_buffer.cpp:176</a></td><td>use compare_less_wrap for this comparison as well</td></tr><tr id="123" 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(118)">../src/packet_buffer.cpp:176</a></td><td>use compare_less_wrap for this comparison as well</td></tr><tr id="118" 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);
@@ -4322,7 +4093,7 @@ we're still sending the metadata</h2><h4>../src/metadata_transfer.cpp:359</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(124)">../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="124" 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(119)">../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="119" 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)
@@ -4376,7 +4147,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(125)">../src/part_file.cpp:344</a></td><td>instead of rebuilding the whole file header and flushing it, update the slot entries as we go</td></tr><tr id="125" 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(120)">../src/part_file.cpp:344</a></td><td>instead of rebuilding the whole file header and flushing it, update the slot entries as we go</td></tr><tr id="120" 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:344</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (block_to_copy == m_piece_size)
 				{
 					m_free_slots.push_back(i-&gt;second);
@@ -4428,7 +4199,7 @@ and flushing it, update the slot entries as we go</h2><h4>../src/part_file.cpp:3
 
 		for (int piece = 0; piece &lt; m_max_pieces; ++piece)
 		{
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(126)">../src/peer_connection.cpp:1022</a></td><td>this should be the global download rate</td></tr><tr id="126" style="display: none;" colspan="3"><td colspan="3"><h2>this should be the global download rate</h2><h4>../src/peer_connection.cpp:1022</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)">../src/peer_connection.cpp:1022</a></td><td>this should be the global download rate</td></tr><tr id="121" style="display: none;" colspan="3"><td colspan="3"><h2>this should be the global download rate</h2><h4>../src/peer_connection.cpp:1022</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		int rate = 0;
 
 		// if we haven't received any data recently, the current download rate
@@ -4479,7 +4250,7 @@ and flushing it, update the slot entries as we go</h2><h4>../src/part_file.cpp:3
 		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(127)">../src/peer_connection.cpp:3229</a></td><td>sort the allowed fast set in priority order</td></tr><tr id="127" style="display: none;" colspan="3"><td colspan="3"><h2>sort the allowed fast set in priority order</h2><h4>../src/peer_connection.cpp:3229</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)">../src/peer_connection.cpp:3229</a></td><td>sort the allowed fast set in priority order</td></tr><tr id="122" style="display: none;" colspan="3"><td colspan="3"><h2>sort the allowed fast set in priority order</h2><h4>../src/peer_connection.cpp:3229</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
@@ -4530,7 +4301,7 @@ and flushing it, update the slot entries as we go</h2><h4>../src/part_file.cpp:3
 		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(128)">../src/peer_connection.cpp:5891</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="128" style="display: none;" colspan="3"><td colspan="3"><h2>The stats checks can not be honored when authenticated encryption is in use
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(123)">../src/peer_connection.cpp:5891</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="123" 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:5891</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if defined TORRENT_LOGGING
 			peer_log("&lt;&lt;&lt; read %d bytes", int(bytes_transferred));
 #endif
@@ -4582,7 +4353,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(129)">../src/piece_picker.cpp:2407</a></td><td>when expanding pieces for cache stripe reasons, the !downloading condition doesn't make much sense</td></tr><tr id="129" 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(124)">../src/piece_picker.cpp:2407</a></td><td>when expanding pieces for cache stripe reasons, the !downloading condition doesn't make much sense</td></tr><tr id="124" 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:2407</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;
@@ -4634,8 +4405,8 @@ the !downloading condition doesn't make much sense</h2><h4>../src/piece_picker.c
 		// 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.
 		boost::tuple&lt;bool, bool&gt; requested_from(piece_picker::downloading_piece const&amp; p
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(130)">../src/session_impl.cpp:520</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="130" 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:520</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_global_class = m_classes.new_peer_class("global");
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(125)">../src/session_impl.cpp:508</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="125" 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:508</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");
 		// local peers are always unchoked
@@ -4686,9 +4457,9 @@ 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)
 #if defined TORRENT_LOGGING
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(131)">../src/session_impl.cpp:1732</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="131" 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(126)">../src/session_impl.cpp:1721</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="126" 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:1732</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
+the generic path. That would even allow for not listening at all.</h2><h4>../src/session_impl.cpp:1721</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// reset the retry counter
 		m_listen_port_retries = m_settings.get_int(settings_pack::max_retry_port_bind);
 
@@ -4739,7 +4510,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(132)">../src/session_impl.cpp:2595</a></td><td>should this function take a shared_ptr instead?</td></tr><tr id="132" style="display: none;" colspan="3"><td colspan="3"><h2>should this function take a shared_ptr instead?</h2><h4>../src/session_impl.cpp:2595</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)">../src/session_impl.cpp:2584</a></td><td>should this function take a shared_ptr instead?</td></tr><tr id="127" style="display: none;" colspan="3"><td colspan="3"><h2>should this function take a shared_ptr instead?</h2><h4>../src/session_impl.cpp:2584</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	{
 #if defined TORRENT_ASIO_DEBUGGING
 		complete_async("session_impl::on_socks_accept");
 #endif
@@ -4790,7 +4561,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(133)">../src/session_impl.cpp:2959</a></td><td>have a separate list for these connections, instead of having to loop through all of them</td></tr><tr id="133" 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:2959</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(128)">../src/session_impl.cpp:2948</a></td><td>have a separate list for these connections, instead of having to loop through all of them</td></tr><tr id="128" 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:2948</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);
@@ -4841,7 +4612,7 @@ retry:
 
 #ifndef TORRENT_DISABLE_DHT
 		int dht_down = 0;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(134)">../src/session_impl.cpp:3000</a></td><td>this should apply to all bandwidth channels</td></tr><tr id="134" style="display: none;" colspan="3"><td colspan="3"><h2>this should apply to all bandwidth channels</h2><h4>../src/session_impl.cpp:3000</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			t.second_tick(tick_interval_ms, m_tick_residual / 1000);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(129)">../src/session_impl.cpp:2989</a></td><td>this should apply to all bandwidth channels</td></tr><tr id="129" style="display: none;" colspan="3"><td colspan="3"><h2>this should apply to all bandwidth channels</h2><h4>../src/session_impl.cpp:2989</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			t.second_tick(tick_interval_ms, m_tick_residual / 1000);
 
 			// if the call to second_tick caused the torrent
 			// to no longer want to be ticked (i.e. it was
@@ -4892,7 +4663,7 @@ retry:
 
 		m_peak_up_rate = (std::max)(m_stat.upload_rate(), m_peak_up_rate);
 		m_peak_down_rate = (std::max)(m_stat.download_rate(), m_peak_down_rate);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(135)">../src/session_impl.cpp:3488</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="135" 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(130)">../src/session_impl.cpp:3477</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="130" 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
@@ -4900,7 +4671,7 @@ 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.</h2><h4>../src/session_impl.cpp:3488</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if defined TORRENT_LOGGING
+avoided alltogether.</h2><h4>../src/session_impl.cpp:3477</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#if defined TORRENT_LOGGING
 				if (t-&gt;allows_peers())
 					t-&gt;log_to_all_peers("AUTO MANAGER PAUSING TORRENT");
 #endif
@@ -4951,7 +4722,7 @@ avoided alltogether.</h2><h4>../src/session_impl.cpp:3488</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(136)">../src/session_impl.cpp:3563</a></td><td>allow extensions to sort torrents for queuing</td></tr><tr id="136" style="display: none;" colspan="3"><td colspan="3"><h2>allow extensions to sort torrents for queuing</h2><h4>../src/session_impl.cpp:3563</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(131)">../src/session_impl.cpp:3552</a></td><td>allow extensions to sort torrents for queuing</td></tr><tr id="131" style="display: none;" colspan="3"><td colspan="3"><h2>allow extensions to sort torrents for queuing</h2><h4>../src/session_impl.cpp:3552</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (t-&gt;is_finished())
 					seeds.push_back(t);
 				else
 					downloaders.push_back(t);
@@ -5002,9 +4773,9 @@ avoided alltogether.</h2><h4>../src/session_impl.cpp:3488</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(137)">../src/session_impl.cpp:3735</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="137" 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(132)">../src/session_impl.cpp:3724</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="132" 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:3735</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// robin fashion, so that every torrent is equally likely to connect to a
+connections</h2><h4>../src/session_impl.cpp:3724</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// robin fashion, so that every torrent is equally likely to connect to a
 		// peer
 
 		// boost connections are connections made by torrent connection
@@ -5055,8 +4826,8 @@ connections</h2><h4>../src/session_impl.cpp:3735</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(138)">../src/session_impl.cpp:3878</a></td><td>post a message to have this happen immediately instead of waiting for the next tick</td></tr><tr id="138" 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:3878</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			torrent* t = p-&gt;associated_torrent().lock().get();
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(133)">../src/session_impl.cpp:3867</a></td><td>post a message to have this happen immediately instead of waiting for the next tick</td></tr><tr id="133" 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:3867</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();
 
 			if (p-&gt;ignore_unchoke_slots() || t == 0 || pi == 0
@@ -5107,7 +4878,7 @@ immediately instead of waiting for the next tick</h2><h4>../src/session_impl.cpp
 		if (num_opt_unchoke == 0) num_opt_unchoke = (std::max)(1, m_allowed_upload_slots / 5);
 
 		// reserve some upload slots for optimistic unchokes
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(139)">../src/session_impl.cpp:3923</a></td><td>this should be called for all peers!</td></tr><tr id="139" style="display: none;" colspan="3"><td colspan="3"><h2>this should be called for all peers!</h2><h4>../src/session_impl.cpp:3923</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/session_impl.cpp:3912</a></td><td>this should be called for all peers!</td></tr><tr id="134" style="display: none;" colspan="3"><td colspan="3"><h2>this should be called for all peers!</h2><h4>../src/session_impl.cpp:3912</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		m_allowed_upload_slots = unchoke_sort(peers, max_upload_rate
 			, unchoke_interval, m_settings);
 
@@ -5158,10 +4929,10 @@ 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(140)">../src/session_impl.cpp:4315</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</td></tr><tr id="140" 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(135)">../src/session_impl.cpp:4304</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</td></tr><tr id="135" 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</h2><h4>../src/session_impl.cpp:4315</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			t-&gt;status(&amp;*i, flags);
+pushed back</h2><h4>../src/session_impl.cpp:4304</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			t-&gt;status(&amp;*i, flags);
 		}
 	}
 	
@@ -5212,7 +4983,7 @@ pushed back</h2><h4>../src/session_impl.cpp:4315</h4><pre style="background: #f6
 		m_disk_thread.update_stats_counters(m_stats_counters);
 
 		m_stats_counters.set_value(counters::sent_ip_overhead_bytes
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(141)">../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="141" 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(136)">../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="136" 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;">		for (;;)
 		{
@@ -5265,7 +5036,7 @@ maybe use the same format as .torrent files and reuse some code from torrent_inf
 		if (file_sizes_ent-&gt;list_size() == 0)
 		{
 			ec.ec = errors::no_files_in_resume_data;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(142)">../src/storage.cpp:1027</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="142" 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(137)">../src/storage.cpp:1027</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="137" 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:1027</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">					if (ec)
 					{
@@ -5318,8 +5089,8 @@ 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(143)">../src/torrent.cpp:481</a></td><td>if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it.</td></tr><tr id="143" 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:481</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(138)">../src/torrent.cpp:507</a></td><td>if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it.</td></tr><tr id="138" 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:507</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		m_torrent_file = tf;
 
 		// now, we might already have this torrent in the session.
@@ -5370,8 +5141,8 @@ the metadata we just downloaded into it.</h2><h4>../src/torrent.cpp:481</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(144)">../src/torrent.cpp:632</a></td><td>if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it.</td></tr><tr id="144" 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:632</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_torrent_file = tf;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(139)">../src/torrent.cpp:658</a></td><td>if the existing torrent doesn't have metadata, insert the metadata we just downloaded into it.</td></tr><tr id="139" 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:658</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_torrent_file = tf;
 		m_info_hash = tf-&gt;info_hash();
 
 		// now, we might already have this torrent in the session.
@@ -5422,12 +5193,12 @@ the metadata we just downloaded into it.</h2><h4>../src/torrent.cpp:632</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(145)">../src/torrent.cpp:1432</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="145" 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(140)">../src/torrent.cpp:1460</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="140" style="display: none;" colspan="3"><td colspan="3"><h2>is verify_peer_cert called once per certificate in the chain, and
 this function just tells us which depth we're at right now? If so, the comment
 makes sense.
 any certificate that isn't the leaf (i.e. the one presented by the peer)
 should be accepted automatically, given preverified is true. The leaf certificate
-need to be verified to make sure its DN matches the info-hash</h2><h4>../src/torrent.cpp:1432</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (pp) p-&gt;add_extension(pp);
+need to be verified to make sure its DN matches the info-hash</h2><h4>../src/torrent.cpp:1460</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			if (pp) p-&gt;add_extension(pp);
 		}
 
 		// if files are checked for this torrent, call the extension
@@ -5478,8 +5249,8 @@ need to be verified to make sure its DN matches the info-hash</h2><h4>../src/tor
 			{
 #if defined TORRENT_LOGGING
 				match = true;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(146)">../src/torrent.cpp:1836</a></td><td>instead of creating the picker up front here, maybe this whole section should move to need_picker()</td></tr><tr id="146" 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:1836</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(141)">../src/torrent.cpp:1864</a></td><td>instead of creating the picker up front here, maybe this whole section should move to need_picker()</td></tr><tr id="141" 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:1864</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		{
 			m_have_all = true;
 			m_ses.get_io_service().post(boost::bind(&amp;torrent::files_checked, shared_from_this()));
 			m_resume_data.reset();
@@ -5530,10 +5301,10 @@ 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(147)">../src/torrent.cpp:2032</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="147" 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(142)">../src/torrent.cpp:2060</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="142" 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:2032</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// pinned torrents are not allowed to be swapped out
+m_extensions.clear();</h2><h4>../src/torrent.cpp:2060</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// pinned torrents are not allowed to be swapped out
 		TORRENT_ASSERT(!m_pinned);
 
 		m_should_be_loaded = false;
@@ -5584,9 +5355,9 @@ m_extensions.clear();</h2><h4>../src/torrent.cpp:2032</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(148)">../src/torrent.cpp:2707</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="148" 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(143)">../src/torrent.cpp:2735</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="143" 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:2707</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// if the files haven't been checked yet, we're
+dedicated listen port</h2><h4>../src/torrent.cpp:2735</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,
 		// we need peers to download from
 		if (!m_files_checked &amp;&amp; valid_metadata()) return;
@@ -5637,7 +5408,7 @@ dedicated listen port</h2><h4>../src/torrent.cpp:2707</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(149)">../src/torrent.cpp:3480</a></td><td>add one peer per IP the hostname resolves to</td></tr><tr id="149" style="display: none;" colspan="3"><td colspan="3"><h2>add one peer per IP the hostname resolves to</h2><h4>../src/torrent.cpp:3480</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(144)">../src/torrent.cpp:3508</a></td><td>add one peer per IP the hostname resolves to</td></tr><tr id="144" style="display: none;" colspan="3"><td colspan="3"><h2>add one peer per IP the hostname resolves to</h2><h4>../src/torrent.cpp:3508</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)
@@ -5688,7 +5459,7 @@ dedicated listen port</h2><h4>../src/torrent.cpp:2707</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(150)">../src/torrent.cpp:4471</a></td><td>update suggest_piece?</td></tr><tr id="150" style="display: none;" colspan="3"><td colspan="3"><h2>update suggest_piece?</h2><h4>../src/torrent.cpp:4471</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(145)">../src/torrent.cpp:4499</a></td><td>update suggest_piece?</td></tr><tr id="145" style="display: none;" colspan="3"><td colspan="3"><h2>update suggest_piece?</h2><h4>../src/torrent.cpp:4499</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 	void torrent::peer_has_all(peer_connection const* peer)
 	{
 		if (has_picker())
@@ -5739,8 +5510,8 @@ dedicated listen port</h2><h4>../src/torrent.cpp:2707</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(151)">../src/torrent.cpp:4614</a></td><td>really, we should just keep the picker around in this case to maintain the availability counters</td></tr><tr id="151" 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:4614</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		pieces.reserve(cs.pieces.size());
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(146)">../src/torrent.cpp:4642</a></td><td>really, we should just keep the picker around in this case to maintain the availability counters</td></tr><tr id="146" 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:4642</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		pieces.reserve(cs.pieces.size());
 
 		// sort in ascending order, to get most recently used first
 		std::sort(cs.pieces.begin(), cs.pieces.end()
@@ -5791,12 +5562,12 @@ in this case to maintain the availability counters</h2><h4>../src/torrent.cpp:46
 	}
 
 	void torrent::abort()
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(152)">../src/torrent.cpp:6580</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="152" 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(147)">../src/torrent.cpp:6614</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="147" style="display: none;" colspan="3"><td colspan="3"><h2>make this more generic to not just work if files have been
 renamed, but also if they have been merged into a single file for instance
 maybe use the same format as .torrent files and reuse some code from torrent_info
 The mapped_files needs to be read both in the network thread
 and in the disk thread, since they both have their own mapped files structures
-which are kept in sync</h2><h4>../src/torrent.cpp:6580</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_last_upload = tmp == -1 ? (std::numeric_limits&lt;boost::int16_t&gt;::min)() : now - tmp;
+which are kept in sync</h2><h4>../src/torrent.cpp:6614</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		m_last_upload = tmp == -1 ? (std::numeric_limits&lt;boost::int16_t&gt;::min)() : now - tmp;
 
 		if (m_use_resume_save_path)
 		{
@@ -5847,12 +5618,12 @@ which are kept in sync</h2><h4>../src/torrent.cpp:6580</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(153)">../src/torrent.cpp:6698</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="153" 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(148)">../src/torrent.cpp:6732</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="148" style="display: none;" colspan="3"><td colspan="3"><h2>if this is a merkle torrent and we can't
 restore the tree, we need to wipe all the
 bits in the have array, but not necessarily
 we might want to do a full check to see if we have
 all the pieces. This is low priority since almost
-no one uses merkle torrents</h2><h4>../src/torrent.cpp:6698</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				add_web_seed(url, web_seed_entry::http_seed);
+no one uses merkle torrents</h2><h4>../src/torrent.cpp:6732</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				add_web_seed(url, web_seed_entry::http_seed);
 			}
 		}
 
@@ -5903,9 +5674,9 @@ no one uses merkle torrents</h2><h4>../src/torrent.cpp:6698</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(154)">../src/torrent.cpp:6888</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="154" 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(149)">../src/torrent.cpp:6922</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="149" 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:6888</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		pieces.resize(m_torrent_file-&gt;num_pieces());
+using file_base</h2><h4>../src/torrent.cpp:6922</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		pieces.resize(m_torrent_file-&gt;num_pieces());
 		if (!has_picker())
 		{
 			std::memset(&amp;pieces[0], m_have_all, pieces.size());
@@ -5956,9 +5727,9 @@ using file_base</h2><h4>../src/torrent.cpp:6888</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(155)">../src/torrent.cpp:8890</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="155" 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(150)">../src/torrent.cpp:8924</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="150" 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:8890</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		if (m_complete != 0xffffff) seeds = m_complete;
+just to save an empty resume data file</h2><h4>../src/torrent.cpp:8924</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;
 
 		if (m_incomplete != 0xffffff) downloaders = m_incomplete;
@@ -6009,10 +5780,10 @@ just to save an empty resume data file</h2><h4>../src/torrent.cpp:8890</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(156)">../src/torrent.cpp:9852</a></td><td>go through the pieces we have and count the total number of downloaders we have. Only count peers that are interested in us since some peers might not send have messages for pieces we have it num_interested == 0, we need to pick a new piece</td></tr><tr id="156" style="display: none;" colspan="3"><td colspan="3"><h2>go through the pieces we have and count the total number
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(151)">../src/torrent.cpp:9886</a></td><td>go through the pieces we have and count the total number of downloaders we have. Only count peers that are interested in us since some peers might not send have messages for pieces we have it num_interested == 0, we need to pick a new piece</td></tr><tr id="151" style="display: none;" colspan="3"><td colspan="3"><h2>go through the pieces we have and count the total number
 of downloaders we have. Only count peers that are interested in us
 since some peers might not send have messages for pieces we have
-it num_interested == 0, we need to pick a new piece</h2><h4>../src/torrent.cpp:9852</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			}
+it num_interested == 0, we need to pick a new piece</h2><h4>../src/torrent.cpp:9886</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			}
 
 			rarest_pieces.clear();
 			rarest_rarity = pp.peer_count;
@@ -6063,8 +5834,8 @@ it num_interested == 0, we need to pick a new piece</h2><h4>../src/torrent.cpp:9
 		if (num_cache_pieces &gt; m_torrent_file-&gt;num_pieces())
 			num_cache_pieces = m_torrent_file-&gt;num_pieces();
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(157)">../src/torrent.cpp:10498</a></td><td>instead of resorting the whole list, insert the peers directly into the right place</td></tr><tr id="157" 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:10498</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(152)">../src/torrent.cpp:10532</a></td><td>instead of resorting the whole list, insert the peers directly into the right place</td></tr><tr id="152" 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:10532</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				printf("timed out [average-piece-time: %d ms ]\n"
 					, m_average_piece_time);
 #endif
 			}
@@ -6107,7 +5878,7 @@ directly into the right place</h2><h4>../src/torrent.cpp:10498</h4><pre style="b
 	{
 		TORRENT_ASSERT(is_single_thread());
 		std::set&lt;std::string&gt; ret;
-		for (std::list&lt;web_seed_entry&gt;::const_iterator i = m_web_seeds.begin()
+		for (std::list&lt;web_seed_t&gt;::const_iterator i = m_web_seeds.begin()
 			, end(m_web_seeds.end()); i != end; ++i)
 		{
 			if (i-&gt;peer_info.banned) continue;
@@ -6115,7 +5886,7 @@ directly into the right place</h2><h4>../src/torrent.cpp:10498</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(158)">../src/torrent_peer.cpp:176</a></td><td>how do we deal with our external address changing?</td></tr><tr id="158" style="display: none;" colspan="3"><td colspan="3"><h2>how do we deal with our external address changing?</h2><h4>../src/torrent_peer.cpp:176</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(153)">../src/torrent_peer.cpp:176</a></td><td>how do we deal with our external address changing?</td></tr><tr id="153" style="display: none;" colspan="3"><td colspan="3"><h2>how do we deal with our external address changing?</h2><h4>../src/torrent_peer.cpp:176</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		, is_v6_addr(false)
 #endif
 #if TORRENT_USE_I2P
 		, is_i2p_addr(false)
@@ -6166,7 +5937,7 @@ directly into the right place</h2><h4>../src/torrent.cpp:10498</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(159)">../src/udp_socket.cpp:286</a></td><td>it would be nice to detect this on posix systems also</td></tr><tr id="159" 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:286</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(154)">../src/udp_socket.cpp:286</a></td><td>it would be nice to detect this on posix systems also</td></tr><tr id="154" 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:286</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		--m_v6_outstanding;
 	}
 	else
 #endif
@@ -6217,7 +5988,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(160)">../src/udp_socket.cpp:777</a></td><td>use the system resolver_interface here</td></tr><tr id="160" style="display: none;" colspan="3"><td colspan="3"><h2>use the system resolver_interface here</h2><h4>../src/udp_socket.cpp:777</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(155)">../src/udp_socket.cpp:777</a></td><td>use the system resolver_interface here</td></tr><tr id="155" style="display: none;" colspan="3"><td colspan="3"><h2>use the system resolver_interface here</h2><h4>../src/udp_socket.cpp:777</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 void udp_socket::set_proxy_settings(proxy_settings const&amp; ps)
 {
 	CHECK_MAGIC;
@@ -6268,7 +6039,7 @@ void udp_socket::on_name_lookup(error_code const&amp; e, tcp::resolver::iterator
 
 	TORRENT_ASSERT(is_single_thread());
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(161)">../src/upnp.cpp:71</a></td><td>listen_interface is not used. It's meant to bind the broadcast socket</td></tr><tr id="161" style="display: none;" colspan="3"><td colspan="3"><h2>listen_interface is not used. It's meant to bind the broadcast socket</h2><h4>../src/upnp.cpp:71</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include &lt;asio/ip/multicast.hpp&gt;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(156)">../src/upnp.cpp:71</a></td><td>listen_interface is not used. It's meant to bind the broadcast socket</td></tr><tr id="156" style="display: none;" colspan="3"><td colspan="3"><h2>listen_interface is not used. It's meant to bind the broadcast socket</h2><h4>../src/upnp.cpp:71</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#include &lt;asio/ip/multicast.hpp&gt;
 #else
 #include &lt;boost/asio/ip/host_name.hpp&gt;
 #include &lt;boost/asio/ip/multicast.hpp&gt;
@@ -6319,7 +6090,7 @@ static error_code ec;
 		m_devices.swap(s-&gt;devices);
 		m_mappings.swap(s-&gt;mappings);
 		delete s;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(162)">../src/ut_metadata.cpp:316</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="162" 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(157)">../src/ut_metadata.cpp:316</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="157" 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:316</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)(
@@ -6371,7 +6142,7 @@ while this buffer is still in the peer's send buffer</h2><h4>../src/ut_metadata.
 #ifdef TORRENT_LOGGING
 				m_pc.peer_log("&lt;== UT_METADATA [ not a dictionary ]");
 #endif
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(163)">../src/utp_stream.cpp:1628</a></td><td>this loop may not be very efficient</td></tr><tr id="163" style="display: none;" colspan="3"><td colspan="3"><h2>this loop may not be very efficient</h2><h4>../src/utp_stream.cpp:1628</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/utp_stream.cpp:1628</a></td><td>this loop may not be very efficient</td></tr><tr id="158" style="display: none;" colspan="3"><td colspan="3"><h2>this loop may not be very efficient</h2><h4>../src/utp_stream.cpp:1628</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 	char* m_buf;
 };
 
@@ -6422,10 +6193,10 @@ 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(164)">../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="164" 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(159)">../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="159" 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_entry&amp; web)
+		, web_seed_t&amp; web)
 		: peer_connection(pack)
 		, m_first_request(true)
 		, m_ssl(false)
@@ -6473,7 +6244,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(165)">../src/kademlia/dht_tracker.cpp:430</a></td><td>ideally this function would be called when the put completes</td></tr><tr id="165" 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(160)">../src/kademlia/dht_tracker.cpp:430</a></td><td>ideally this function would be called when the put completes</td></tr><tr id="160" 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:430</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);
@@ -6525,7 +6296,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:430</h4><pre style="backgr
 		std::string flat_data;
 		bencode(std::back_inserter(flat_data), data);
 		sha1_hash target = item_target_id(
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(166)">../include/libtorrent/bitfield.hpp:158</a></td><td>rename to data() ?</td></tr><tr id="166" style="display: none;" colspan="3"><td colspan="3"><h2>rename to data() ?</h2><h4>../include/libtorrent/bitfield.hpp:158</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (m_buf[i] != 0) return false;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(161)">../include/libtorrent/bitfield.hpp:158</a></td><td>rename to data() ?</td></tr><tr id="161" style="display: none;" colspan="3"><td colspan="3"><h2>rename to data() ?</h2><h4>../include/libtorrent/bitfield.hpp:158</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">				if (m_buf[i] != 0) return false;
 			}
 			return true;
 		}
@@ -6576,7 +6347,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:430</h4><pre style="backgr
 				return ret;
 			}	
 #endif // TORRENT_HAS_SSE
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(167)">../include/libtorrent/block_cache.hpp:218</a></td><td>make this 32 bits and to count seconds since the block cache was created</td></tr><tr id="167" 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:218</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		bool operator==(cached_piece_entry const&amp; rhs) const
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(162)">../include/libtorrent/block_cache.hpp:218</a></td><td>make this 32 bits and to count seconds since the block cache was created</td></tr><tr id="162" 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:218</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; }
 
 		// if this is set, we'll be calculating the hash
@@ -6627,7 +6398,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:430</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(168)">../include/libtorrent/config.hpp:334</a></td><td>Make this count Unicode characters instead of bytes on windows</td></tr><tr id="168" 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:334</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(163)">../include/libtorrent/config.hpp:334</a></td><td>Make this count Unicode characters instead of bytes on windows</td></tr><tr id="163" 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:334</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">#pragma message ( "unknown OS, assuming BSD" )
 #else
 #warning "unknown OS, assuming BSD"
 #endif
@@ -6678,7 +6449,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:430</h4><pre style="backgr
 
 #endif
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(169)">../include/libtorrent/disk_buffer_pool.hpp:128</a></td><td>try to remove the observers, only using the async_allocate handlers</td></tr><tr id="169" 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:128</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(164)">../include/libtorrent/disk_buffer_pool.hpp:128</a></td><td>try to remove the observers, only using the async_allocate handlers</td></tr><tr id="164" 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:128</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;
@@ -6729,7 +6500,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:430</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(170)">../include/libtorrent/file.hpp:169</a></td><td>move this into a separate header file, TU pair</td></tr><tr id="170" style="display: none;" colspan="3"><td colspan="3"><h2>move this into a separate header file, TU pair</h2><h4>../include/libtorrent/file.hpp:169</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TORRENT_EXTRA_EXPORT bool is_root_path(std::string const&amp; f);
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(165)">../include/libtorrent/file.hpp:169</a></td><td>move this into a separate header file, TU pair</td></tr><tr id="165" style="display: none;" colspan="3"><td colspan="3"><h2>move this into a separate header file, TU pair</h2><h4>../include/libtorrent/file.hpp:169</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	TORRENT_EXTRA_EXPORT bool is_root_path(std::string const&amp; f);
 
 
 	// internal used by create_torrent.hpp
@@ -6780,7 +6551,7 @@ put completes</h2><h4>../src/kademlia/dht_tracker.cpp:430</h4><pre style="backgr
 
 	struct file;
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(171)">../include/libtorrent/peer_connection.hpp:206</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="171" 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(166)">../include/libtorrent/peer_connection.hpp:206</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="166" 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:206</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			, m_connecting(!t.expired())
@@ -6834,7 +6605,7 @@ outlive their peers</h2><h4>../include/libtorrent/peer_connection.hpp:206</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(172)">../include/libtorrent/peer_connection.hpp:1059</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="172" style="display: none;" colspan="3"><td colspan="3"><h2>factor this out into its own class with a virtual interface
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(167)">../include/libtorrent/peer_connection.hpp:1059</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="167" 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:1059</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
@@ -6886,7 +6657,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(173)">../include/libtorrent/peer_connection_interface.hpp:45</a></td><td>make this interface smaller!</td></tr><tr id="173" style="display: none;" colspan="3"><td colspan="3"><h2>make this interface smaller!</h2><h4>../include/libtorrent/peer_connection_interface.hpp:45</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(168)">../include/libtorrent/peer_connection_interface.hpp:45</a></td><td>make this interface smaller!</td></tr><tr id="168" style="display: none;" colspan="3"><td colspan="3"><h2>make this interface smaller!</h2><h4>../include/libtorrent/peer_connection_interface.hpp:45</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">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
@@ -6937,7 +6708,7 @@ namespace libtorrent
 		virtual tcp::endpoint const&amp; remote() const = 0;
 		virtual tcp::endpoint local_endpoint() const = 0;
 		virtual void disconnect(error_code const&amp; ec, operation_t op, int error = 0) = 0;
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(174)">../include/libtorrent/performance_counters.hpp:132</a></td><td>should keepalives be in here too? how about dont-have, share-mode, upload-only</td></tr><tr id="174" 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(169)">../include/libtorrent/performance_counters.hpp:132</a></td><td>should keepalives be in here too? how about dont-have, share-mode, upload-only</td></tr><tr id="169" 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:132</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			// a connect candidate
 			connection_attempt_loops,
 			// successful incoming connections (not rejected for any reason)
@@ -6989,7 +6760,7 @@ 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(175)">../include/libtorrent/performance_counters.hpp:429</a></td><td>some space could be saved here by making gauges 32 bits</td></tr><tr id="175" 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:429</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(176)">../include/libtorrent/performance_counters.hpp:430</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="176" 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(170)">../include/libtorrent/performance_counters.hpp:429</a></td><td>some space could be saved here by making gauges 32 bits</td></tr><tr id="170" 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:429</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(171)">../include/libtorrent/performance_counters.hpp:430</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="171" 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:430</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			limiter_down_bytes,
 
@@ -7024,7 +6795,7 @@ synchronization points</h2><h4>../include/libtorrent/performance_counters.hpp:43
 
 #endif
 
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(177)">../include/libtorrent/piece_picker.hpp:668</a></td><td>should this be allocated lazily?</td></tr><tr id="177" style="display: none;" colspan="3"><td colspan="3"><h2>should this be allocated lazily?</h2><h4>../include/libtorrent/piece_picker.hpp:668</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;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(172)">../include/libtorrent/piece_picker.hpp:668</a></td><td>should this be allocated lazily?</td></tr><tr id="172" style="display: none;" colspan="3"><td colspan="3"><h2>should this be allocated lazily?</h2><h4>../include/libtorrent/piece_picker.hpp:668</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);
 
 		// returns an iterator to the downloading piece, whichever
@@ -7075,7 +6846,7 @@ synchronization points</h2><h4>../include/libtorrent/performance_counters.hpp:43
 		//    and some are still in the requested state
 		// 2: downloading pieces where every block is
 		//    finished or writing
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(178)">../include/libtorrent/proxy_base.hpp:171</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="178" 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(173)">../include/libtorrent/proxy_base.hpp:171</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="173" 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:171</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">	void bind(endpoint_type const&amp; /* endpoint */)
 	{
 //		m_sock.bind(endpoint);
@@ -7127,7 +6898,7 @@ m_sock.bind(endpoint, ec);</h2><h4>../include/libtorrent/proxy_base.hpp:171</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(179)">../include/libtorrent/receive_buffer.hpp:260</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="179" 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(174)">../include/libtorrent/receive_buffer.hpp:260</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="174" 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:260</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
@@ -7167,7 +6938,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(180)">../include/libtorrent/session.hpp:849</a></td><td>add get_peer_class_type_filter() as well</td></tr><tr id="180" style="display: none;" colspan="3"><td colspan="3"><h2>add get_peer_class_type_filter() as well</h2><h4>../include/libtorrent/session.hpp:849</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(175)">../include/libtorrent/session.hpp:851</a></td><td>add get_peer_class_type_filter() as well</td></tr><tr id="175" style="display: none;" colspan="3"><td colspan="3"><h2>add get_peer_class_type_filter() as well</h2><h4>../include/libtorrent/session.hpp:851</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.
 		// 
@@ -7218,61 +6989,61 @@ 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(181)">../include/libtorrent/settings_pack.hpp:1077</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="181" 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:1077</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			auto_manage_startup,
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(176)">../include/libtorrent/settings_pack.hpp:1106</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="176" 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:1106</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			auto_manage_startup,
 
 			// ``seeding_piece_quota`` is the number of pieces to send to a peer,
 			// when seeding, before rotating in another peer to the unchoke set.
-			// It defaults to 3 pieces, which means that when seeding, any peer we've
-			// sent more than this number of pieces to will be unchoked in favour of
-			// a choked peer.
+			// It defaults to 3 pieces, which means that when seeding, any peer
+			// we've sent more than this number of pieces to will be unchoked in
+			// favour of a choked peer.
 			seeding_piece_quota,
 
-			// ``max_sparse_regions`` is a limit of the number of *sparse regions* in
-			// a torrent. A sparse region is defined as a hole of pieces we have not
-			// yet downloaded, in between pieces that have been downloaded. This is
-			// used as a hack for windows vista which has a bug where you cannot
-			// write files with more than a certain number of sparse regions. This
-			// limit is not hard, it will be exceeded. Once it's exceeded, pieces
-			// that will maintain or decrease the number of sparse regions are
-			// prioritized. To disable this functionality, set this to 0. It defaults
-			// to 0 on all platforms except windows.
+			// ``max_sparse_regions`` is a limit of the number of *sparse regions*
+			// in a torrent. A sparse region is defined as a hole of pieces we
+			// have not yet downloaded, in between pieces that have been
+			// downloaded. This is used as a hack for windows vista which has a
+			// bug where you cannot write files with more than a certain number of
+			// sparse regions. This limit is not hard, it will be exceeded. Once
+			// it's exceeded, pieces that will maintain or decrease the number of
+			// sparse regions are prioritized. To disable this functionality, set
+			// this to 0. It defaults to 0 on all platforms except windows.
 			max_sparse_regions,
 
 <div style="background: #ffff00" width="100%">			max_rejects,
 </div>
-			// ``recv_socket_buffer_size`` and ``send_socket_buffer_size`` specifies
-			// the buffer sizes set on peer sockets. 0 (which is the default) means
-			// the OS default (i.e. don't change the buffer sizes). The socket buffer
-			// sizes are changed using setsockopt() with SOL_SOCKET/SO_RCVBUF and
-			// SO_SNDBUFFER.
- 			recv_socket_buffer_size,
+			// ``recv_socket_buffer_size`` and ``send_socket_buffer_size``
+			// specifies the buffer sizes set on peer sockets. 0 (which is the
+			// default) means the OS default (i.e. don't change the buffer sizes).
+			// The socket buffer sizes are changed using setsockopt() with
+			// SOL_SOCKET/SO_RCVBUF and SO_SNDBUFFER.
+			recv_socket_buffer_size,
 			send_socket_buffer_size,
 
-			// ``file_checks_delay_per_block`` is the number of milliseconds to sleep
-			// in between disk read operations when checking torrents. This defaults
-			// to 0, but can be set to higher numbers to slow down the rate at which
-			// data is read from the disk while checking. This may be useful for
-			// background tasks that doesn't matter if they take a bit longer, as long
-			// as they leave disk I/O time for other processes.
+			// ``file_checks_delay_per_block`` is the number of milliseconds to
+			// sleep in between disk read operations when checking torrents. This
+			// defaults to 0, but can be set to higher numbers to slow down the
+			// rate at which data is read from the disk while checking. This may
+			// be useful for background tasks that doesn't matter if they take a
+			// bit longer, as long as they leave disk I/O time for other
+			// processes.
 			file_checks_delay_per_block,
 
-			// ``read_cache_line_size`` is the number of blocks to read into the read
-			// cache when a read cache miss occurs. Setting this to 0 is essentially
-			// the same thing as disabling read cache. The number of blocks read
-			// into the read cache is always capped by the piece boundry.
+			// ``read_cache_line_size`` is the number of blocks to read into the
+			// read cache when a read cache miss occurs. Setting this to 0 is
+			// essentially the same thing as disabling read cache. The number of
+			// blocks read into the read cache is always capped by the piece
+			// boundry.
 			// 
-			// When a piece in the write cache has ``write_cache_line_size`` contiguous
-			// blocks in it, they will be flushed. Setting this to 1 effectively
-			// disables the write cache.
+			// When a piece in the write cache has ``write_cache_line_size``
+			// contiguous blocks in it, they will be flushed. Setting this to 1
+			// effectively disables the write cache.
 			read_cache_line_size,
 			write_cache_line_size,
 
-			// ``optimistic_disk_retry`` is the number of seconds from a disk write
-			// errors occur on a torrent until libtorrent will take it out of the
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(182)">../include/libtorrent/torrent.hpp:1212</a></td><td>this wastes 5 bits per file</td></tr><tr id="182" style="display: none;" colspan="3"><td colspan="3"><h2>this wastes 5 bits per file</h2><h4>../include/libtorrent/torrent.hpp:1212</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(177)">../include/libtorrent/torrent.hpp:1254</a></td><td>this wastes 5 bits per file</td></tr><tr id="177" style="display: none;" colspan="3"><td colspan="3"><h2>this wastes 5 bits per file</h2><h4>../include/libtorrent/torrent.hpp:1254</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
 
@@ -7323,7 +7094,7 @@ disconnected.</h2><h4>../include/libtorrent/settings_pack.hpp:1077</h4><pre styl
 
 		// 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(183)">../include/libtorrent/torrent.hpp:1271</a></td><td>These two bitfields should probably be coalesced into one</td></tr><tr id="183" style="display: none;" colspan="3"><td colspan="3"><h2>These two bitfields should probably be coalesced into one</h2><h4>../include/libtorrent/torrent.hpp:1271</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(178)">../include/libtorrent/torrent.hpp:1313</a></td><td>These two bitfields should probably be coalesced into one</td></tr><tr id="178" style="display: none;" colspan="3"><td colspan="3"><h2>These two bitfields should probably be coalesced into one</h2><h4>../include/libtorrent/torrent.hpp:1313</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
@@ -7374,7 +7145,7 @@ disconnected.</h2><h4>../include/libtorrent/settings_pack.hpp:1077</h4><pre styl
 		// 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(184)">../include/libtorrent/torrent_info.hpp:123</a></td><td>include the number of peers received from this tracker, at last announce</td></tr><tr id="184" 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(179)">../include/libtorrent/torrent_info.hpp:123</a></td><td>include the number of peers received from this tracker, at last announce</td></tr><tr id="179" style="display: none;" colspan="3"><td colspan="3"><h2>include the number of peers received from this tracker, at last
 announce</h2><h4>../include/libtorrent/torrent_info.hpp:123</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 		// if this tracker failed the last time it was contacted
 		// this error code specifies what error occurred
@@ -7426,7 +7197,59 @@ announce</h2><h4>../include/libtorrent/torrent_info.hpp:123</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(185)">../include/libtorrent/upnp.hpp:108</a></td><td>support using the windows API for UPnP operations as well</td></tr><tr id="185" 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(180)">../include/libtorrent/torrent_info.hpp:270</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="180" 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:270</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		// The URL of the web seed
+		std::string url;
+
+		// Optional authentication. If this is set, it's passed
+		// in as HTTP basic auth to the web seed. The format is:
+		// username:password.
+		std::string auth;
+
+		// Any extra HTTP headers that need to be passed to the web seed
+		headers_t extra_headers;
+
+		// The type of web seed (see type_t)
+		boost::uint8_t type;
+	};
+
+#ifndef BOOST_NO_EXCEPTIONS
+	// for backwards compatibility with 0.14
+	typedef libtorrent_exception invalid_torrent_file;
+#endif
+
+<div style="background: #ffff00" width="100%">	class TORRENT_EXPORT torrent_info
+</div>	{
+	public:
+
+		// The constructor that takes an info-hash  will initialize the info-hash
+		// to the given value, but leave all other fields empty. This is used
+		// internally when downloading torrents without the metadata. The
+		// metadata will be created by libtorrent as soon as it has been
+		// downloaded from the swarm.
+		// 
+		// The constructor that takes a lazy_entry will create a torrent_info
+		// object from the information found in the given torrent_file. The
+		// lazy_entry represents a tree node in an bencoded file. To load an
+		// ordinary .torrent file into a lazy_entry, use lazy_bdecode().
+		// 
+		// The version that takes a buffer pointer and a size will decode it as a
+		// .torrent file and initialize the torrent_info object for you.
+		// 
+		// The version that takes a filename will simply load the torrent file
+		// and decode it inside the constructor, for convenience. This might not
+		// be the most suitable for applications that want to be able to report
+		// detailed errors on what might go wrong.
+		//
+		// There is an upper limit on the size of the torrent file that will be
+		// loaded by the overload taking a filename. If it's important that even
+		// very large torrent files are loaded, use one of the other overloads.
+		// 
+		// The overloads that takes an ``error_code const&amp;`` never throws if an
+		// 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(181)">../include/libtorrent/upnp.hpp:108</a></td><td>support using the windows API for UPnP operations as well</td></tr><tr id="181" 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
@@ -7477,7 +7300,7 @@ public:
 	// is -1, which means failure. There will not be any error alert notification for
 	// mappings that fail with a -1 return value.
 	int add_mapping(protocol_type p, int external_port, int local_port);
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(186)">../include/libtorrent/utp_stream.hpp:395</a></td><td>implement blocking write. Low priority since it's not used (yet)</td></tr><tr id="186" 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:395</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(182)">../include/libtorrent/utp_stream.hpp:395</a></td><td>implement blocking write. Low priority since it's not used (yet)</td></tr><tr id="182" 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:395</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;
@@ -7528,7 +7351,7 @@ public:
 		if (m_impl == 0)
 		{
 			m_io_service.post(boost::bind&lt;void&gt;(handler, asio::error::not_connected, 0));
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(187)">../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="187" 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(183)">../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="183" 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
@@ -7580,7 +7403,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(188)">../include/libtorrent/aux_/session_impl.hpp:368</a></td><td>move the login info into the tracker_request object</td></tr><tr id="188" style="display: none;" colspan="3"><td colspan="3"><h2>move the login info into the tracker_request object</h2><h4>../include/libtorrent/aux_/session_impl.hpp:368</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(184)">../include/libtorrent/aux_/session_impl.hpp:367</a></td><td>move the login info into the tracker_request object</td></tr><tr id="184" style="display: none;" colspan="3"><td colspan="3"><h2>move the login info into the tracker_request object</h2><h4>../include/libtorrent/aux_/session_impl.hpp:367</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 			void on_lsd_announce(error_code const&amp; e);
 
 			// called when a port mapping is successful, or a router returns
@@ -7631,7 +7454,7 @@ public:
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 			void add_extensions_to_torrent(
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(189)">../include/libtorrent/aux_/session_impl.hpp:830</a></td><td>should this be renamed m_outgoing_interfaces?</td></tr><tr id="189" style="display: none;" colspan="3"><td colspan="3"><h2>should this be renamed m_outgoing_interfaces?</h2><h4>../include/libtorrent/aux_/session_impl.hpp:830</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(185)">../include/libtorrent/aux_/session_impl.hpp:830</a></td><td>should this be renamed m_outgoing_interfaces?</td></tr><tr id="185" style="display: none;" colspan="3"><td colspan="3"><h2>should this be renamed m_outgoing_interfaces?</h2><h4>../include/libtorrent/aux_/session_impl.hpp:830</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;
 
@@ -7682,7 +7505,7 @@ public:
 			mutable boost::uint8_t m_interface_index;
 
 			void open_new_incoming_socks_connection();
-</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(190)">../include/libtorrent/aux_/session_impl.hpp:884</a></td><td>replace this by a proper asio timer</td></tr><tr id="190" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:884</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(186)">../include/libtorrent/aux_/session_impl.hpp:884</a></td><td>replace this by a proper asio timer</td></tr><tr id="186" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:884</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			{
 				open_ssl_socket = 0x10
 			};
 
@@ -7706,7 +7529,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(191)">../include/libtorrent/aux_/session_impl.hpp:889</a></td><td>replace this by a proper asio timer</td></tr><tr id="191" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:889</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			listen_socket_t setup_listener(std::string const&amp; device
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(187)">../include/libtorrent/aux_/session_impl.hpp:889</a></td><td>replace this by a proper asio timer</td></tr><tr id="187" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:889</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">			listen_socket_t setup_listener(std::string const&amp; device
 				, bool ipv4, int port, int&amp; retries, int flags, error_code&amp; ec);
 
 #ifndef TORRENT_DISABLE_DHT	
@@ -7732,7 +7555,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(192)">../include/libtorrent/aux_/session_impl.hpp:896</a></td><td>replace this by a proper asio timer</td></tr><tr id="192" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:896</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(188)">../include/libtorrent/aux_/session_impl.hpp:896</a></td><td>replace this by a proper asio timer</td></tr><tr id="188" style="display: none;" colspan="3"><td colspan="3"><h2>replace this by a proper asio timer</h2><h4>../include/libtorrent/aux_/session_impl.hpp:896</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">
 			// the number of unchoked peers as set by the auto-unchoker
 			// this should always be &gt;= m_max_uploads
 			int m_allowed_upload_slots;
@@ -7783,7 +7606,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(193)">../include/libtorrent/aux_/session_interface.hpp:199</a></td><td>it would be nice to not have this be part of session_interface</td></tr><tr id="193" 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:199</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		virtual boost::uint16_t listen_port() const = 0;
+</pre></td></tr><tr style="background: #ccc"><td>relevance&nbsp;0</td><td><a href="javascript:expand(189)">../include/libtorrent/aux_/session_interface.hpp:199</a></td><td>it would be nice to not have this be part of session_interface</td></tr><tr id="189" 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:199</h4><pre style="background: #f6f6f6; border: solid 1px #ddd;">		virtual boost::uint16_t listen_port() const = 0;
 		virtual boost::uint16_t ssl_listen_port() const = 0;
 
 		// used to (potentially) issue socket write calls onto multiple threads
diff --git a/docs/troubleshooting.html b/docs/troubleshooting.html
index b974c2f67..04783d29f 100644
--- a/docs/troubleshooting.html
+++ b/docs/troubleshooting.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/tuning.html b/docs/tuning.html
index df1166f5d..77f81db9b 100644
--- a/docs/tuning.html
+++ b/docs/tuning.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/udp_tracker_protocol.html b/docs/udp_tracker_protocol.html
index 9a95db7af..ba8285373 100644
--- a/docs/udp_tracker_protocol.html
+++ b/docs/udp_tracker_protocol.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/docs/utp.html b/docs/utp.html
index 63931cb6d..27e58e5da 100644
--- a/docs/utp.html
+++ b/docs/utp.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
+<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" />
diff --git a/include/libtorrent/settings_pack.hpp b/include/libtorrent/settings_pack.hpp
index 8ad8bf3ca..a515ce114 100644
--- a/include/libtorrent/settings_pack.hpp
+++ b/include/libtorrent/settings_pack.hpp
@@ -189,7 +189,8 @@ namespace libtorrent
 			
 			// when using a proxy, these are the credentials (if any) to use whne
 			// connecting to it. see proxy_type
-			proxy_username, proxy_password,
+			proxy_username,
+			proxy_password,
 
 			// sets the i2p_ SAM bridge to connect to. set the port with the
 			// ``i2p_port`` setting.
