merged resume data fix from RC_0_16

ChangeLog

@@ -5,6 +5,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* relax file timestamp requirements for accepting resume data
 	* fix performance issue in web seed downloader (coalescing of blocks sometimes wouldn't work)
 	* web seed fixes (better support for torrents without trailing / in web seeds)
 	* fix some issues with SSL over uTP connections

src/storage.cpp

@@ -197,6 +197,9 @@ namespace libtorrent
 
 			if (flags & ignore_timestamps) continue;
 
+			// if there is no timestamp in the resume data, ignore it
+			if (size_iter->second == 0) continue;
+
 			// allow one second 'slack', because of FAT volumes
 			// in sparse mode, allow the files to be more recent
 			// than the resume data, but only by 5 minutes