Merge branch 'master' of github.com:kevinlynx/dhtcrawler2

Conflicts:
	ebin/dhtcrawler.app
	ebin/tor_download.beam

ebin/dhtcrawler.app

@@ -1,16 +1,20 @@
 {application,dhtcrawler,
              [{description,"A DHT crawler to index magnet hash to torrent"},
+<<<<<<< HEAD
               {vsn,"f776cbb"},
+=======
+              {vsn,"9d8c60f"},
+>>>>>>> f5965304f7ceedfc0c3e8d74a131dafaaefe4a95
               {registered,[dht_crawler_sup]},
               {applications,[kernel,stdlib,crypto,public_key,ssl,inets,bson,
                              mongodb]},
               {mod,{crawler_app,[]}},
               {modules,[bt_conn,bt_message,config,crawler_app,crawler_http,
-                        crawler_stats,crawler_sup,db_frontend,db_hash,
-                        db_hash_reader,db_hash_reader_sup,db_loc_torrent,
-                        db_store_mongo,db_system,dht_monitor,hash_reader,
-                        hash_reader_stats,hash_reader_sup,http_cache,
-                        http_handler,loc_torrent,loc_torrent_cache,
-                        loc_torrent_sup,string_split,time_util,tor_builder,
-                        tor_download,tor_download_stats,tor_location_reader,
-                        tor_location_writer,torrent_file,urldecode,vlog]}]}.
+                        crawler_stats,crawler_sup,db_daterange,db_frontend,
+                        db_hash,db_loc_torrent,db_store_mongo,db_system,
+                        dht_monitor,hash_reader,hash_reader_stats,
+                        hash_reader_sup,http_cache,http_handler,loc_torrent,
+                        loc_torrent_cache,loc_torrent_sup,string_split,
+                        time_util,tor_builder,tor_download,tor_download_stats,
+                        tor_location,tor_location_reader,tor_location_writer,
+                        torrent_file,transfer,urldecode,vlog]}]}.