diff --git a/appveyor.yml b/appveyor.yml
index 436a3887f..04a365117 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -31,7 +31,7 @@ install:
 - cd %ROOT_DIRECTORY%
 - if %compiler% == msvc-14.0 if defined crypto if not exist openssl-1.0.1p-vs2015.7z (
     echo downloading openssl-2015
-    & appveyor DownloadFile "http://www.npcglib.org/~stathis/downloads/openssl-1.0.1p-vs2015.7z"
+    & appveyor DownloadFile "https://www.npcglib.org/~stathis/downloads/openssl-1.0.1p-vs2015.7z"
   )
 - if %compiler% == msvc-14.0 if defined crypto (
     echo extracting openssl-2015
diff --git a/examples/connection_tester.cpp b/examples/connection_tester.cpp
index dace4a192..e72af46bd 100644
--- a/examples/connection_tester.cpp
+++ b/examples/connection_tester.cpp
@@ -739,6 +739,8 @@ void print_usage()
 		"    options for this command:\n"
 		"    -s <size>          the size of the torrent in megabytes\n"
 		"    -n <num-files>     the number of files in the test torrent\n"
+		"    -a                 introduce a lot of pad-files\n"
+		"                       (pad files are not supported for gen-data or upload)\n"
 		"    -t <file>          the file to save the .torrent file to\n"
 		"    -T <name>          the name of the torrent (and directory\n"
 		"                       its files are saved in)\n\n"
@@ -794,13 +796,12 @@ void hasher_thread(lt::create_torrent* t, piece_index_t const start_piece
 }
 
 // size is in megabytes
-void generate_torrent(std::vector<char>& buf, int size, int num_files
-	, char const* torrent_name)
+void generate_torrent(std::vector<char>& buf, int num_pieces, int num_files
+	, char const* torrent_name, bool with_padding)
 {
 	file_storage fs;
 	// 1 MiB piece size
 	const int piece_size = 1024 * 1024;
-	const int num_pieces = size;
 	const std::int64_t total_size = std::int64_t(piece_size) * num_pieces;
 
 	std::int64_t s = total_size;
@@ -816,7 +817,9 @@ void generate_torrent(std::vector<char>& buf, int size, int num_files
 		file_size += 200;
 	}
 
-	lt::create_torrent t(fs, piece_size);
+	lt::create_torrent t(fs, piece_size, with_padding ? 100 : -1);
+
+	num_pieces = t.num_pieces();
 
 	int const num_threads = std::thread::hardware_concurrency()
 		? std::thread::hardware_concurrency() : 4;
@@ -906,6 +909,7 @@ int main(int argc, char* argv[])
 	char const* destination_ip = "127.0.0.1";
 	int destination_port = 6881;
 	int churn = 0;
+	bool gen_pad_files = false;
 
 	argv += 2;
 	argc -= 2;
@@ -926,6 +930,7 @@ int main(int argc, char* argv[])
 		switch (optname[1])
 		{
 			case 'C': test_corruption = true; continue;
+			case 'a': gen_pad_files = true; continue;
 		}
 
 		if (argc == 0)
@@ -960,7 +965,7 @@ int main(int argc, char* argv[])
 		name = name.substr(0, name.find_last_of('.'));
 		std::printf("generating torrent: %s\n", name.c_str());
 		generate_torrent(tmp, size ? size : 1024, num_files ? num_files : 1
-			, name.c_str());
+			, name.c_str(), gen_pad_files);
 
 		FILE* output = stdout;
 		if ("-"_sv != torrent_file)
diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index aa53c1eae..00ab961b8 100644
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -299,8 +299,8 @@ namespace libtorrent {
 		// m_paused is also true.
 		bool m_graceful_pause_mode:1;
 
-		// state subscription. If set, a pointer to this torrent
-		// will be added to the m_state_updates set in session_impl
+		// state subscription. If set, a pointer to this torrent will be added
+		// to the session_impl::m_torrent_lists[torrent_state_updates]
 		// whenever this torrent's state changes (any state).
 		bool m_state_subscription:1;
 
@@ -1610,16 +1610,10 @@ namespace libtorrent {
 		// is optional and may be 0xffffff
 		std::uint32_t m_incomplete:24;
 
-
 		// true when the torrent should announce to
 		// the DHT
 		bool m_announce_to_dht:1;
 
-		// in state_updates list. When adding a torrent to the
-		// session_impl's m_state_update list, this bit is set
-		// to never add the same torrent twice
-		bool m_in_state_updates:1;
-
 		// these represent whether or not this torrent is counted
 		// in the total counters of active seeds and downloads
 		// in the session.
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 1d8c5d7e2..81aebabc2 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -199,7 +199,6 @@ namespace libtorrent {
 		, m_padding(0)
 		, m_incomplete(0xffffff)
 		, m_announce_to_dht(!(p.flags & torrent_flags::paused))
-		, m_in_state_updates(false)
 		, m_is_active_download(false)
 		, m_is_active_finished(false)
 		, m_ssl_torrent(false)