From a516bf46e5f098940bd2f6ab0746b5f8abc0903a Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 22 Mar 2015 04:34:11 +0000
Subject: [PATCH] merged changes from RC_1_0

---
 ChangeLog                            | 2 ++
 docs/index.rst                       | 8 +++-----
 docs/template.txt                    | 2 +-
 docs/template2.txt                   | 4 ++--
 src/kademlia/traversal_algorithm.cpp | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f81a40006..7439b868d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,8 @@
 	* almost completely changed the storage interface (for custom storage)
 	* added support for hashing pieces in multiple threads
 
+1.0.4 release
+
 	* fix bug in python binding for file_progress on torrents with no metadata
 	* fix assert when removing a connected web seed
 	* fix bug in tracker timeout logic
diff --git a/docs/index.rst b/docs/index.rst
index e312b78c4..2f036df82 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,7 +21,6 @@
 * `report bugs`_
 * `sourceforge page`_
 * `blog`_
-* `wiki`_
 
 --------
 
@@ -83,8 +82,7 @@ libtorrent
 .. _archive: http://dir.gmane.org/gmane.network.bit-torrent.libtorrent
 .. _`who's using libtorrent?`: projects.html
 .. _`report bugs`: http://code.google.com/p/libtorrent/issues/entry
-.. _sourceforge page: http://www.sourceforge.net/projects/libtorrent
-.. _wiki: http://code.google.com/p/libtorrent/wiki/index
+.. _sourceforge page: http://sourceforge.net/projects/libtorrent
 .. _blog: http://blog.libtorrent.org
 
 .. _`ruby bindings`: http://libtorrent-ruby.rubyforge.org/
@@ -115,7 +113,7 @@ Support the development of libtorrent
 .. raw:: html
 	
 	<a class="FlattrButton" style="display:none;" href="http://libtorrent.org"></a>
-	<noscript><a href="http://flattr.com/thing/95662/libtorrent" target="_blank">
+	<noscript><a href="https://flattr.com/thing/95662/libtorrent" target="_blank">
 	<img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript>
 
 
@@ -133,7 +131,7 @@ license
 
 libtorrent is released under the BSD-license_.
 
-.. _BSD-license: http://www.opensource.org/licenses/bsd-license.php
+.. _BSD-license: http://opensource.org/licenses/bsd-license.php
 
 This means that you can use the library in your project without having to
 release its source code. The only requirement is that you give credit
diff --git a/docs/template.txt b/docs/template.txt
index 93b689219..6691655a1 100644
--- a/docs/template.txt
+++ b/docs/template.txt
@@ -61,6 +61,6 @@
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
 %(body_suffix)s
diff --git a/docs/template2.txt b/docs/template2.txt
index 175e5ac42..af9168c2f 100644
--- a/docs/template2.txt
+++ b/docs/template2.txt
@@ -26,7 +26,7 @@
     </table>
     <div id="main">
 
-<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js" type="text/javascript"></script>
 <!-- libtorrent, 728x90, created 11/12/08 -->
 <ins class="adsbygoogle"
      style="display:inline-block;width:728px;height:90px"
@@ -72,7 +72,7 @@
     </tr>
     </table>
     </div>
-    <div id="filler"></div></div>
+    <div id="filler"></div>
 
     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
     </script>
diff --git a/src/kademlia/traversal_algorithm.cpp b/src/kademlia/traversal_algorithm.cpp
index 7600107bb..fddd8b31b 100644
--- a/src/kademlia/traversal_algorithm.cpp
+++ b/src/kademlia/traversal_algorithm.cpp
@@ -217,7 +217,7 @@ void traversal_algorithm::start()
 {
 	// in case the routing table is empty, use the
 	// router nodes in the table
-	if (m_results.size() < 8) add_router_entries();
+	if (m_results.size() < 3) add_router_entries();
 	init();
 	bool is_done = add_requests();
 	if (is_done) done();