Handle more torrent conflicts

PR #17668.
This is a continuation of #17576.
Handles the case when you add hybrid torrent by v1-only magnet link and this torrent is already known by its full hybrid info hash (i.e. by both v1 and v2 info hashes).

src/base/bittorrent/session.h

@@ -60,6 +60,7 @@ namespace BitTorrent
     class InfoHash;
     class MagnetUri;
     class Torrent;
+    class TorrentID;
     class TorrentInfo;
     struct CacheStatus;
     struct SessionStatus;