merged changes from RC_1_0

Makefile.am

@@ -131,7 +131,6 @@ DOCS_PAGES = \
 ED25519_SOURCE = \
 	ed25519/readme.md \
 	ed25519/test.cpp \
-	ed25519/src/ed25519.hpp \
 	ed25519/src/fe.h \
 	ed25519/src/fixedint.h \
 	ed25519/src/ge.h \

ed25519/src/add_scalar.cpp

@@ -1,4 +1,4 @@
-#include "ed25519.hpp"
+#include "libtorrent/ed25519.hpp"
 #include "ge.h"
 #include "sc.h"
 

ed25519/src/key_exchange.cpp

@@ -1,4 +1,4 @@
-#include "ed25519.hpp"
+#include "libtorrent/ed25519.hpp"
 #include "fe.h"
 
 void ed25519_key_exchange(unsigned char *shared_secret

ed25519/src/keypair.cpp

@@ -1,4 +1,4 @@
-#include "ed25519.hpp"
+#include "libtorrent/ed25519.hpp"
 #include "sha512.h"
 #include "ge.h"
 

ed25519/src/seed.cpp

@@ -1,4 +1,4 @@
-#include "ed25519.hpp"
+#include "libtorrent/ed25519.hpp"
 
 #ifndef ED25519_NO_SEED
 

ed25519/src/sign.cpp

@@ -1,4 +1,4 @@
-#include "ed25519.hpp"
+#include "libtorrent/ed25519.hpp"
 #include "sha512.h"
 #include "ge.h"
 #include "sc.h"

ed25519/src/verify.cpp

@@ -1,4 +1,4 @@
-#include "ed25519.hpp"
+#include "libtorrent/ed25519.hpp"
 #include "sha512.h"
 #include "ge.h"
 #include "sc.h"

include/libtorrent/Makefile.am

@@ -47,6 +47,7 @@ nobase_include_HEADERS = \
   disk_io_thread.hpp           \
   disk_observer.hpp            \
   disk_job_pool.hpp            \
+  ed25519.hpp                  \
   entry.hpp                    \
   enum_net.hpp                 \
   error.hpp                    \

src/kademlia/item.cpp

@@ -33,8 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <libtorrent/hasher.hpp>
 #include <libtorrent/kademlia/item.hpp>
 #include <libtorrent/bencode.hpp>
-
+#include <libtorrent/ed25519.hpp>
-#include "ed25519.hpp"
 
 #ifdef TORRENT_DEBUG
 #include "libtorrent/lazy_entry.hpp"

tools/dht_put.cpp

@@ -36,7 +36,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/alert_types.hpp"
 #include "libtorrent/bencode.hpp" // for bencode()
 #include "libtorrent/kademlia/item.hpp" // for sign_mutable_item
-#include "ed25519.h"
+#include "libtorrent/ed25519.h"
+
 #include <boost/bind.hpp>
 
 #include <stdlib.h>