net-p2p/tribler: 6.0.3 -> 6.3.3

Changelog:
https://github.com/Tribler/tribler/releases

PR:		193901
Submitted by:	tkato432@yahoo.com

5 files changed, 1205 insertions, 1201 deletions

diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index e5517c38ba30..cdd3d8164cda 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -2,16 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	tribler
-PORTVERSION=	6.0.3
-PORTREVISION=	7
+PORTVERSION=	6.3.3
 CATEGORIES=	net-p2p
-#MASTER_SITES=	http://dl.tribler.org/
-MASTER_SITES=	GENTOO/distfiles \
-		GOOGLE_CODE:apsw
-PROJECTHOST=	apsw
-DISTFILES=	${PORTNAME}_${PORTVERSION}_all.deb \
-		${APSW_DISTFILE}:apsw
-EXTRACT_ONLY=	${PORTNAME}_${PORTVERSION}_all.deb
+MASTER_SITES=	GH \
+		https://github.com/Tribler/tribler/releases/download/${PORTVERSION:S/^/v/}/:tribler
+DISTFILES=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}${EXTRACT_SUFX} \
+		${PORTNAME}_${PORTVERSION}_all.deb:tribler
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Streaming capable P2P network client based on BitTorrent
@@ -19,77 +15,83 @@ COMMENT=	Streaming capable P2P network client based on BitTorrent
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libvlc.so:${PORTSDIR}/multimedia/vlc
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>0:${PORTSDIR}/databases/py-apsw \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1 \
+		${PYTHON_PKGNAMEPREFIX}gmpy>0:${PORTSDIR}/math/py-gmpy \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>0:${PORTSDIR}/net-p2p/libtorrent-rasterbar-python \
 		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}feedparser>0:${PORTSDIR}/textproc/py-feedparser
 
-WRKSRC=		${WRKDIR}/${APSW_DISTNAME}
-
-USES=		python:2
-USE_PYTHON=	distutils
-PYDISTUTILS_EGGINFO=	${APSW_DISTNAME:S/-r/_r/}-py${PYTHON_VER}.egg-info
-USE_WX=		3.0
+USE_GITHUB=	yes
+GH_ACCOUNT=	LipuFei
+GH_PROJECT=	libswift
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	01745ce
+
+USES=		desktop-file-utils gmake python:2 shebangfix twisted:run
+SHEBANG_FILES=	../usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/*.py \
+		../usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/*/*.py \
+		../usr/share/tribler/Tribler/Debug/memory.py \
+		../usr/share/tribler/Tribler/Main/*.py \
+		../usr/share/tribler/Tribler/dispersy/*/*.py \
+		../usr/share/tribler/Tribler/vlc.py
+USE_WX=		2.8+
 WX_COMPS=	python
 WX_UNICODE=	yes
-
-USE_SQLITE=	3
+USE_OPENSSL=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-TRIBLER_DIR=	${PYTHONPREFIX_SITELIBDIR}/tribler
-
-APSW_DISTNAME=	apsw-3.7.14.1-r1
-APSW_DISTFILE=	${APSW_DISTNAME}.zip
+OPTIONS_DEFINE=		DOCS VLC
+OPTIONS_DEFAULT=	VLC
 
-OPTIONS_DEFINE=	DOCS
+VLC_DESC=		Multimedia support via VLC
+VLC_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
+			vlc:${PORTSDIR}/multimedia/vlc
 
-.include <bsd.port.options.mk>
+TRIBLER_DIR=	${PYTHONPREFIX_SITELIBDIR}/tribler
 
 post-extract:
-	@(${GZCAT} ${WRKDIR}/data.tar.gz | ${TAR} -C ${WRKDIR} -xf -)
-	@(${UNZIP_CMD} -qo ${DISTDIR}/${APSW_DISTFILE} -d ${WRKDIR})
+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} data.tar.gz \
+		${EXTRACT_AFTER_ARGS})
 
 post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|/bin/netstat|netstat|' \
-		${WRKDIR}/usr/share/tribler/Tribler/Core/NATFirewall/guessip.py
-	@${REINPLACE_CMD} -i '' -e 's|^from Tribler.Main.Utility.Feeds ||' \
-		${WRKDIR}/usr/share/tribler/Tribler/Main/Utility/Feeds/rssparser.py
-	@${REINPLACE_CMD} -e 's|%%OPSYS%%|${OPSYS}| ; \
-		 s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}| ; \
-		 s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' ${WRKDIR}/usr/bin/tribler
-	@${REINPLACE_CMD} -e 's|-O2|| ; \
-		 s|CPPFLAGS|CXXFLAGS| ; \
-		 s|-g -I$${LIBEVENT_HOME}/include|-I$${LOCALBASE}/include| ; \
+	@${REINPLACE_CMD} -e \
+		's|-O2|$${CXXFLAGS}| ; \
+		 s|-g|| ; \
 		 s|-lstdc++|| ; \
-		 s|g++|$${CXX}| ; \
-		 s|$${LIBEVENT_HOME}/lib|$${LOCALBASE}/lib|g' \
-		${WRKDIR}/usr/share/tribler/Tribler/SwiftEngine/Makefile
-	@${REINPLACE_CMD} 's|linux|freebsd|' \
+		 s|g++|$${CXX}|' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|%%OPSYS%%|${OPSYS}| ; \
+		 s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}| ; \
+		 s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' \
+		${WRKDIR}/usr/bin/tribler
+	@${REINPLACE_CMD} -e \
+		's|Application;|| ; \
+		 /^Categories/s|$$|;| ; \
+		 /^MimeType/s|$$|;|' \
+		${WRKDIR}/usr/share/applications/tribler.desktop
+	@${REINPLACE_CMD} -i '' -e \
+		's|linux|${OPSYS:tl}|' \
 		${WRKDIR}/usr/share/tribler/Tribler/vlc.py
 
-post-build:
-	@(cd ${WRKDIR}/usr/share/tribler/Tribler/SwiftEngine \
-		&& ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-			${ALL_TARGET})
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/usr/share/tribler
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/usr/share/tribler
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/usr/bin/tribler ${STAGEDIR}${PREFIX}/bin
-	(cd ${WRKDIR}/usr/share/tribler/Tribler/SwiftEngine \
-		&& ${INSTALL_PROGRAM} swift ${STAGEDIR}${PREFIX}/libexec)
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} swift \
+		${STAGEDIR}${PREFIX}/libexec)
+	(cd ${WRKDIR}/usr/bin && ${INSTALL_SCRIPT} tribler \
+		${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${TRIBLER_DIR}/Tribler
 	@${LN} -sf ${PREFIX}/libexec/swift ${STAGEDIR}${TRIBLER_DIR}
 	@(${TAR} -C ${WRKDIR}/usr/share/tribler/Tribler \
 		--exclude "Build" \
 		--exclude "LGPL-2.1.txt" \
 		--exclude "SwiftEngine" \
-		--exclude "feedparset.*" \
 		--exclude "readme.txt" \
 		--exclude "*LICENSE*.txt" \
 		--exclude "*.orig" \
@@ -99,12 +101,18 @@ post-install:
 	@${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type d -print0 | \
 		${XARGS} -0 ${CHMOD} a+rx
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	(cd ${WRKDIR}/usr/share/applications \
-		&& ${INSTALL_DATA} tribler.desktop ${STAGEDIR}${DESKTOPDIR})
-	(cd ${WRKDIR}/usr/share/pixmaps \
-		&& ${INSTALL_DATA} tribler.xpm ${STAGEDIR}${PREFIX}/share/pixmaps)
+	(cd ${WRKDIR}/usr/share/applications && ${INSTALL_DATA} \
+		tribler.desktop ${STAGEDIR}${DESKTOPDIR})
+	(cd ${WRKDIR}/usr/share/pixmaps && ${INSTALL_DATA} \
+		tribler.xpm ${STAGEDIR}${PREFIX}/share/pixmaps)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKDIR}/usr/share/tribler/Tribler \
-		&& ${INSTALL_DATA} *LICENSE*.txt readme.txt ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKDIR}/usr/share/tribler/Tribler && ${INSTALL_DATA} \
+		*LICENSE*.txt readme.txt ${STAGEDIR}${DOCSDIR})
+	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
+	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O -m compileall \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
 
 .include <bsd.port.mk>
diff --git a/net-p2p/tribler/distinfo b/net-p2p/tribler/distinfo
index 3a07533ff119..5f630d1da63d 100644
--- a/net-p2p/tribler/distinfo
+++ b/net-p2p/tribler/distinfo
@@ -1,4 +1,4 @@
-SHA256 (tribler_6.0.3_all.deb) = bf6173e2162602133e93a0ca06026f33d5a95edcefc57ff41c3a59f14a19e835
-SIZE (tribler_6.0.3_all.deb) = 5848674
-SHA256 (apsw-3.7.14.1-r1.zip) = 690277428925231057382150a6073c2bea8026d463b0b9bf25f2655ab802c6be
-SIZE (apsw-3.7.14.1-r1.zip) = 678959
+SHA256 (LipuFei-libswift-01745ce.tar.gz) = c348a6b2be2d362cee71587307bfd26d36067f6c0f2e0dc12dc0a6410abf39a9
+SIZE (LipuFei-libswift-01745ce.tar.gz) = 3300760
+SHA256 (tribler_6.3.3_all.deb) = 95f6cac8f5760229896bb66ee8e4d6b50939b7da4f1fb0c9a589a7617c456010
+SIZE (tribler_6.3.3_all.deb) = 1997346
diff --git a/net-p2p/tribler/files/patch-httpgw.cpp b/net-p2p/tribler/files/patch-httpgw.cpp
deleted file mode 100644
index 7b8378b7fbf2..000000000000
--- a/net-p2p/tribler/files/patch-httpgw.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../usr/share/tribler/Tribler/SwiftEngine/httpgw.cpp.orig	2012-10-12 14:17:32.000000000 +0900
-+++ ../usr/share/tribler/Tribler/SwiftEngine/httpgw.cpp	2012-11-01 02:10:53.000000000 +0900
-@@ -11,6 +11,11 @@
- #include <event2/bufferevent.h>
- #include <sstream>
- 
-+#include <sys/param.h>
-+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_vesion < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
-+#define log2(x) (log(x) / log(2))
-+#endif
-+
- using namespace swift;
- 
- #define HTTPGW_PROGRESS_STEP_BYTES 		(256*1024)
diff --git a/net-p2p/tribler/files/patch-swarmplyer.py b/net-p2p/tribler/files/patch-swarmplyer.py
deleted file mode 100644
index 43e0c40f3251..000000000000
--- a/net-p2p/tribler/files/patch-swarmplyer.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../usr/share/tribler/Tribler/Player/swarmplayer.py.orig	2012-02-08 00:33:48.000000000 +0900
-+++ ../usr/share/tribler/Tribler/Player/swarmplayer.py	2012-02-24 18:44:52.000000000 +0900
-@@ -438,9 +438,9 @@
- 
-     s_play = status.get_or_create_status_element("playable", False)
-     if playable:
-+        global START_TIME
-         if preprogress < 1.0:
-             if s_play.get_value() == True:
--                global START_TIME
-                 status.create_and_add_event("failed_after", [time.time() - START_TIME])
-                 START_TIME = time.time()
-                 
-@@ -448,7 +448,6 @@
- 
-         elif s_play.get_value() == False:
-             s_play.set_value(True)
--            global START_TIME
-             status.create_and_add_event("playable_in", [time.time() - START_TIME])
-             START_TIME = time.time()
- 
diff --git a/net-p2p/tribler/pkg-plist b/net-p2p/tribler/pkg-plist
index 77a4911f0d06..4599885c5248 100644
--- a/net-p2p/tribler/pkg-plist
+++ b/net-p2p/tribler/pkg-plist
@@ -1,14 +1,10 @@
 bin/tribler
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.py.bak
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/Category.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/Category.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/Category.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/FamilyFilter.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/FamilyFilter.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/FamilyFilter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/TestCategory.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/TestCategory.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/TestCategory.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/__init__.pyo
@@ -18,27 +14,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/init_category.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/init_category.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/porncat.txt
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/API.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/API.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/API.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadImpl.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadImpl.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadImpl.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadRuntimeConfig.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadRuntimeConfig.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadRuntimeConfigBaseImpl.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadRuntimeConfigBaseImpl.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/DownloadRuntimeConfigBaseImpl.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/LaunchManyCore.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/LaunchManyCore.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/LaunchManyCore.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/SessionRuntimeConfig.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/SessionRuntimeConfig.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/SessionRuntimeConfig.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/SingleDownload.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/SingleDownload.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/SingleDownload.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/ThreadPool.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/ThreadPool.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/ThreadPool.pyo
@@ -60,229 +38,42 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Base.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Base.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Base.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Choker.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Choker.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Choker.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Connecter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Connecter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Downloader.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Downloader.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/DownloaderFeedback.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Encrypter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Encrypter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Encrypter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/FileSelector.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/FileSelector.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/FileSelector.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Filter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Filter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Filter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/GetRightHTTPDownloader.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/GetRightHTTPDownloader.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/GetRightHTTPDownloader.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/HTTPDownloader.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/HTTPDownloader.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/HTTPDownloader.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/HoffmanHTTPDownloader.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/HoffmanHTTPDownloader.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/HoffmanHTTPDownloader.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/MessageID.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/MessageID.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/MessageID.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/NatCheck.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/NatCheck.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/PiecePicker.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/PiecePicker.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/PiecePicker.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Rerequester.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Rerequester.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Rerequester.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Statistics.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Statistics.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Statistics.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Storage.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Storage.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Storage.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/StorageWrapper.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/StorageWrapper.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/StorageWrapper.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/T2T.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/T2T.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/T2T.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Uploader.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/Uploader.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/btformats.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/btformats.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/btformats.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/convert.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/convert.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/convert.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/fakeopen.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/fakeopen.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/fakeopen.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/track.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/track.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1/track.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/CurrentRateMeasure.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/CurrentRateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/CurrentRateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/HTTPHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/HTTPHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/HTTPHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/PSYCO.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/PSYCO.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/PSYCO.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RateLimiter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RateLimiter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RateLimiter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RateMeasure.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RawServer.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/RawServer.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/ServerPortHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/ServerPortHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/ServerPortHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/SocketHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/SocketHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/SocketHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/bencode.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/bencode.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/bencode.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/bitfield.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/bitfield.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/bitfield.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/clock.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/clock.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/clock.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/download_bt1.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/download_bt1.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/download_bt1.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/inifile.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/inifile.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/inifile.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/iprangeparse.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/iprangeparse.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/iprangeparse.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/natpunch.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/natpunch.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/natpunch.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/parseargs.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/parseargs.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/parseargs.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/parsedir.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/parsedir.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/parsedir.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/piecebuffer.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/piecebuffer.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/piecebuffer.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/selectpoll.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/subnetparse.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/subnetparse.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/subnetparse.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/torrentlistparse.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/torrentlistparse.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/torrentlistparse.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/zurllib.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/zurllib.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/zurllib.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/CacheDBHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/CacheDBHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/CacheDBHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/EditDist.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/EditDist.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/EditDist.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/Notifier.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/Notifier.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/Notifier.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteCacheDBHandler.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteCacheDBHandler.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteCacheDBHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/cachedb.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/cachedb.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/cachedb.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/friends.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/friends.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/friends.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/maxflow.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/maxflow.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/maxflow.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/sqlitecachedb.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/sqlitecachedb.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB/sqlitecachedb.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/ClosedSwarm.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/ClosedSwarm.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/ClosedSwarm.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/PaymentIntegration.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/PaymentIntegration.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/PaymentIntegration.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/Tools.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/Tools.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/Tools.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/MagnetLink.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/MagnetLink.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/MagnetLink.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/MiniBitTorrent.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/MiniBitTorrent.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/MiniBitTorrent.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/mainlineDHT.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/mainlineDHT.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/mainlineDHT.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/MANIFEST.in
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/README.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/Makefile
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bencode.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bencode.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bencode.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bootstrap.backup
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bootstrap.main
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bootstrap.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bootstrap.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bootstrap.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bootstrap_stable
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/bootstrap_unstable
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/cache.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/cache.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/cache.pyo
@@ -295,9 +86,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/exp_plugin_template.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/exp_plugin_template.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/exp_plugin_template.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/experiment_dht.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/experiment_dht.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/experiment_dht.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/floodbarrier.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/floodbarrier.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/floodbarrier.pyo
@@ -322,9 +110,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/node.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/node.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/node.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/old_message.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/old_message.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/old_message.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/ptime.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/ptime.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/ptime.pyo
@@ -337,15 +122,68 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/responder.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/responder.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/responder.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/routing_plugin_template.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/routing_plugin_template.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/routing_plugin_template.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/routing_table.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/routing_table.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/routing_table.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/state.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/state.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/state.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/swift_tracker.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/swift_tracker.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/swift_tracker.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_bencode.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_bencode.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_bencode.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_boostrap.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_boostrap.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_boostrap.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_const.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_const.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_const.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_controller.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_controller.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_controller.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_floodbarrier.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_floodbarrier.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_floodbarrier.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_identifier.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_identifier.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_identifier.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_logs/state.dat.broken
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_logs/state.dat.good
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_message.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_message.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_message.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_message_tools.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_message_tools.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_message_tools.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_minitwisted.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_minitwisted.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_minitwisted.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_node.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_node.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_node.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_pymdht.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_pymdht.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_pymdht.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_querier.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_querier.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_querier.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_routing_table.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_routing_table.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_routing_table.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_token_manager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_token_manager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_token_manager.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_tracker.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_tracker.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_tracker.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/test_utils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/testing_mocks.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/testing_mocks.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/testing_mocks.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/token_manager.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/token_manager.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/token_manager.pyo
@@ -355,151 +193,398 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/utils.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/utils.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core/utils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/Makefile
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/make.bat
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/MDHT_Spec.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/background.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/conf.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/conf.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/conf.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/controller.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/core.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/identifier.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/index.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/introduction.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/message.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/minitwisted.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/node.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/plugins.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/profiling.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/pymdht.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/doc/source/tracker.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/example.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/geo/geo.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/geo/geo.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/geo/geo.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/geo/geolitecityupdate.sh
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/collect_tracker_info.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/collect_tracker_info.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/collect_tracker_info.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/experimental_m_ping.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/experimental_m_ping.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/experimental_m_ping.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a16.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a16.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a16.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a4.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a4.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a4.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a8_m2.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a8_m2.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_a8_m2.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_m3.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_m3.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_m3.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_m3_a4.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_m3_a4.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_m3_a4.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_size_estimation.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_size_estimation.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/lookup_size_estimation.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_bep5.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_bep5.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_bep5.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt128.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt128.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt128.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt64.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt64.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice_rtt64.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/conductor.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/conductor.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/conductor.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/conductor_spy.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/conductor_spy.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/conductor_spy.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/get_infohashes.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/get_infohashes.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/get_infohashes.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/announce.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/announce.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/announce.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/announce_peer.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/announce_peer.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/announce_peer.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/bootstrap_miner.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/bootstrap_miner.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/bootstrap_miner.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/cdf.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/cdf.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/cdf.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/find_node.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/find_node.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/find_node.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/get_peers.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/get_peers.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/get_peers.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/get_peers_announce_peer.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/get_peers_announce_peer.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/get_peers_announce_peer.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/infohashes.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/infohashes.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/infohashes.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/ip_geo_locator.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/ip_geo_locator.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/ip_geo_locator.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/lookup_parser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/lookup_parser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/lookup_parser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/maintenance_parser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/maintenance_parser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/maintenance_parser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/multi_rtt.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/multi_rtt.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/multi_rtt.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/parser_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/parser_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/parser_utils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/percentage_of_unique_ip.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/percentage_of_unique_ip.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/percentage_of_unique_ip.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/ping.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/ping.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/ping.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/rtt_parser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/rtt_parser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/rtt_parser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/same_ip.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/same_ip.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/same_ip.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/traffic_multiparser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/traffic_multiparser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/traffic_multiparser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/unique_ip_geo_locator.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/unique_ip_geo_locator.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/parsers/unique_ip_geo_locator.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotter.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotter.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotter.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/noplot_traffic_top_sec.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/noplot_traffic_top_sec.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/noplot_traffic_top_sec.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_announce_per_hour.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_announce_per_hour.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_announce_per_hour.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_announce_per_min.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_announce_per_min.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_announce_per_min.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_nofliers.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_nofliers.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_nofliers.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_queries.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_queries.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_queries.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time_duel.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time_duel.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time_duel.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time_nofliers.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time_nofliers.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_l_time_nofliers.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_lookup_queries.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_lookup_queries.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_lookup_queries.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_lookup_time.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_lookup_time.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_lookup_time.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_nolookup_queries.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_nolookup_queries.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_nolookup_queries.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_time_vs_swarmsize.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_time_vs_swarmsize.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_box_time_vs_swarmsize.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_queries.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_queries.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_queries.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_queries_t1.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_queries_t1.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_queries_t1.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time_auth.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time_auth.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time_auth.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time_closest.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time_closest.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_l_time_closest.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_lookup_queries.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_lookup_queries.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_lookup_queries.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_rtt.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_rtt.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cdf_rtt.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cum_m_queries.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cum_m_queries.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_cum_m_queries.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_find_node_per_hour.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_find_node_per_hour.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_find_node_per_hour.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_find_node_per_min.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_find_node_per_min.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_find_node_per_min.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_hour.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_hour.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_hour.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_min.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_min.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_min.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_sec.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_sec.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_get_peers_per_sec.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_it_all.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_it_all.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_it_all.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_l_time_vs_swarmsize.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_l_time_vs_swarmsize.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_l_time_vs_swarmsize.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_lookup_queries_cdf.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_lookup_queries_cdf.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_lookup_queries_cdf.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_node2_get_peers_announce_per_min.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_node2_get_peers_announce_per_min.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_node2_get_peers_announce_per_min.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_nolookup_queries.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_nolookup_queries.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_nolookup_queries.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_peers_vs_nodes.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_peers_vs_nodes.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_peers_vs_nodes.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_ping_per_hour.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_ping_per_hour.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_ping_per_hour.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_ping_per_min.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_ping_per_min.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_ping_per_min.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_time_vs_nodes.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_time_vs_nodes.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_time_vs_nodes.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_time_vs_swarmsize.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_time_vs_swarmsize.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/profiler/plotters/plot_time_vs_swarmsize.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/README.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/check_bootstrap.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/check_bootstrap.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/check_bootstrap.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/crawl24.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/crawl24.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/crawl24.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/crawl_nodes.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/crawl_nodes.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/crawl_nodes.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/get_nodes_from_state.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/get_nodes_from_state.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/release_tools/get_nodes_from_state.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/run_pymdht_node.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/run_pymdht_node.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/run_pymdht_node.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/crawler.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/crawler.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/crawler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/r_crawler.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/r_crawler.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/r_crawler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/sr_crawler.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/sr_crawler.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/sr_crawler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/table_extractor.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/table_extractor.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/scripts/table_extractor.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/setup.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/setup.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/setup.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/repex.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/repex.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/repex.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/ut_pex.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/ut_pex.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/ut_pex.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Download.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Download.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Download.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/DEPRECATED_pymdht_daemon.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/DEPRECATED_pymdht_daemon.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/DEPRECATED_pymdht_daemon.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/TODO.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/aliasing.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/aliasing.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/aliasing.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/cli.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/cli.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/cli.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/dslist.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/dslist.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/dslist.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/errorparser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/errorparser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/errorparser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/filereader.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/filereader.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/filereader.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/filters.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/filters.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/filters.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/graphical_display.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/graphical_display.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/graphical_display.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/gui.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/gui.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/gui.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/images/exit.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/images/forward.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/images/playpause.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/images/rewind.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/images/run.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/images/save.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/images/stop.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/images/visualization.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/interactive_dht_ext.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/interactive_dht_ext.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/interactive_dht_ext.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/mainclass.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/mainclass.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/mainclass.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/queryparser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/queryparser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/queryparser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/responseparser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/responseparser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/responseparser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/telnet.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/telnet.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/telnet.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ui/telnet_api.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/uTorrent.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/uTorrent.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/uTorrent.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/ut2mdht.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/ut2mdht.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/ut2mdht/ut2mdht.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DownloadConfig.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DownloadConfig.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DownloadConfig.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DownloadState.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DownloadState.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DownloadState.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/LiveSourceAuthConfig.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/LiveSourceAuthConfig.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/LiveSourceAuthConfig.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/LibtorrentDownloadImpl.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/LibtorrentDownloadImpl.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/LibtorrentDownloadImpl.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/LibtorrentMgr.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/LibtorrentMgr.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/LibtorrentMgr.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Libtorrent/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Merkle/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Merkle/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Merkle/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Merkle/merkle.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Merkle/merkle.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Merkle/merkle.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Multicast/Multicast.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Multicast/Multicast.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Multicast/Multicast.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Multicast/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Multicast/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Multicast/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/ConnectionCheck.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/ConnectionCheck.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/ConnectionCheck.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/DialbackMsgHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/DialbackMsgHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/DialbackMsgHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatCheck.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatCheck.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatCheckMsgHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatCheckMsgHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatCheckMsgHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatTraversal.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatTraversal.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/NatTraversal.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/ReturnConnHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/ReturnConnHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/ReturnConnHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/TimeoutCheck.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/TimeoutCheck.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/TimeoutCheck.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/TimeoutFinder.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/TimeoutFinder.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/TimeoutFinder.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/UDPPuncture.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/UDPPuncture.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/UDPPuncture.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/UPnPThread.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/UPnPThread.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/UPnPThread.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/guessip.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/guessip.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/guessip.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/upnp.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/upnp.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall/upnp.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/MetadataHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/MetadataHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/MetadataHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/OverlayApps.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/OverlayApps.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/OverlayApps.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/OverlayThreadingBridge.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/OverlayThreadingBridge.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/OverlayThreadingBridge.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/SecureOverlay.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/SecureOverlay.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/SecureOverlay.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/permid.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/permid.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay/permid.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/Doe.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/Doe.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/Doe.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/DoeMessageHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/DoeMessageHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/DoeMessageHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/Proxy.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/Proxy.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/Proxy.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyDownloader.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyDownloader.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyDownloader.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyMessageHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyMessageHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyMessageHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyPeerManager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyPeerManager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyPeerManager.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyServiceUtil.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyServiceUtil.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/ProxyServiceUtil.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/RatePredictor.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/RatePredictor.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/RatePredictor.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/MessageID.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/MessageID.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/MessageID.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/RawServer.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/RawServer.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/RawServer.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/SocketHandler.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/SocketHandler.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/SocketHandler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/selectpoll.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/selectpoll.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RawServer/selectpoll.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RemoteTorrentHandler.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RemoteTorrentHandler.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RemoteTorrentHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RequestPolicy.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RequestPolicy.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/RequestPolicy.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/Bundler.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/Bundler.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/Bundler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/KeywordSearch.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/KeywordSearch.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/KeywordSearch.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/Reranking.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/Reranking.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/Reranking.pyo
@@ -509,54 +594,15 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ServerPortHandler.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ServerPortHandler.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ServerPortHandler.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Session.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Session.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Session.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SessionConfig.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SessionConfig.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SessionConfig.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/FriendshipMsgHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/FriendshipMsgHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/OverlapMsgHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/OverlapMsgHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/OverlapMsgHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/RemoteTorrentHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/RemoteTorrentHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/ChannelCrawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/ChannelCrawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/ChannelCrawler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Crawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Crawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Crawler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/DatabaseCrawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/DatabaseCrawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/DatabaseCrawler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/FriendshipCrawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/FriendshipCrawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/FriendshipCrawler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Logger.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Logger.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Logger.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/PunctureCrawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/PunctureCrawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/PunctureCrawler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/RepexCrawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/RepexCrawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/RepexCrawler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/SeedingStatsCrawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/SeedingStatsCrawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/SeedingStatsCrawler.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/LivingLabReporter.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/LivingLabReporter.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/LivingLabReporter.pyo
@@ -578,28 +624,15 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/UserEventLogCrawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/UserEventLogCrawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/UserEventLogCrawler.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/VideoPlaybackCrawler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/VideoPlaybackCrawler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/VideoPlaybackCrawler.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/crawler.txt
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/tribler_friendship_stats_sdb.sql
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/tribler_seedingstats_sdb.sql
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/tribler_videoplayback_stats.sql
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDef.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDef.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDef.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadImpl.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadImpl.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadImpl.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadRuntimeConfig.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadRuntimeConfig.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftDownloadRuntimeConfig.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcess.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcess.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/SwiftProcess.pyo
@@ -609,9 +642,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/coreemulator.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/coreemulator.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/coreemulator.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/util.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/util.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift/util.pyo
@@ -634,9 +664,33 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/bencode.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/bencode.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/bencode.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/bitfield.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/bitfield.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/bitfield.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/clock.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/clock.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/clock.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/configparser.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/configparser.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/configparser.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/encoding.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/encoding.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/encoding.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/network_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/network_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/network_utils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/parseargs.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/parseargs.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/parseargs.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/timeouturlopen.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/timeouturlopen.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/timeouturlopen.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/twisted_thread.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/twisted_thread.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/twisted_thread.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/unicode.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/unicode.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/unicode.pyo
@@ -646,36 +700,27 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/win32regchecker.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/win32regchecker.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/win32regchecker.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/LiveSourceAuth.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/LiveSourceAuth.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/LiveSourceAuth.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/MovieTransport.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/MovieTransport.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/MovieTransport.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/PiecePickerSVC.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/PiecePickerSVC.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/PiecePickerSVC.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/PiecePickerStreaming.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/PiecePickerStreaming.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/PiecePickerStreaming.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/SVCTransporter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/SVCTransporter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/SVCTransporter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/SVCVideoStatus.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/SVCVideoStatus.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/SVCVideoStatus.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoOnDemand.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoOnDemand.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoOnDemand.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoSource.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoSource.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoSource.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoStatus.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoStatus.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoStatus.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VLCWrapper.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VLCWrapper.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VLCWrapper.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoPlayer.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoPlayer.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoPlayer.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoServer.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoServer.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoServer.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoUtility.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoUtility.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/VideoUtility.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/defs.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/defs.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/defs.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video/utils.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/__init__.pyo
@@ -688,10 +733,15 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/osutils.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/osutils.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/osutils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/permid.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/permid.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/permid.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/simpledefs.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/simpledefs.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/simpledefs.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/superpeer.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/version.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/version.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/version.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/__init__.pyo
@@ -701,47 +751,12 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/memory.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/memory.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/memory.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/SwarmPlayerIcon.ico
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/SwarmPlayerLogo.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/SwarmPluginIcon.ico
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/SwarmPluginLogo.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/SwarmServerIcon.ico
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/background.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/fullScreen.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/fullScreen_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/logoTribler.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/logoTribler_small.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/mute.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/mute_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/pause.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/pause_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/play.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/play_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/save.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/saveDisabled.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/saveDisabled_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/save_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/sliderDot.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/sliderVolume.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/splash.jpg
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/splash.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/torrenticon.ico
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/tribler.ico
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/volume.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Images/volume_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Lang/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Lang/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Lang/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Lang/english.lang
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Lang/lang.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Lang/lang.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Lang/lang.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/AddTorrent.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/AddTorrent.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/AddTorrent.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/BandwidthSelector.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/BandwidthSelector.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/BandwidthSelector.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/ConfirmationDialog.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/ConfirmationDialog.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/ConfirmationDialog.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/CreateTorrent.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/CreateTorrent.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/CreateTorrent.pyo
@@ -751,9 +766,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/GUITaskQueue.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/GUITaskQueue.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/GUITaskQueue.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/MoveTorrents.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/MoveTorrents.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/MoveTorrents.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/RemoveTorrent.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/RemoveTorrent.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/RemoveTorrent.pyo
@@ -763,24 +775,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/ThreadSafeProgressDialog.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/ThreadSafeProgressDialog.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/ThreadSafeProgressDialog.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/TorrentMaker.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/TorrentMaker.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/TorrentMaker.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/abcoption.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/abcoption.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/abcoption.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/aboutme.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/aboutme.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/aboutme.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/regdialog.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/regdialog.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/regdialog.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/socnetmyinfo.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/socnetmyinfo.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/socnetmyinfo.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/systray.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/systray.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/systray.pyo
@@ -790,9 +787,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/dirfeed.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/dirfeed.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/dirfeed.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/feedparser.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/feedparser.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/feedparser.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/rssparser.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/rssparser.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/rssparser.pyo
@@ -808,57 +802,51 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/compat.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/compat.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/compat.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/constants.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/constants.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/constants.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/helpers.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/helpers.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/helpers.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/logging_util.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/logging_util.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/logging_util.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/regchecker.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/regchecker.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/regchecker.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/utility.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/utility.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/utility.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/channelcast-supporter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/channelcast-supporter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/channelcast-supporter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/dispersy-channel-booster.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/dispersy-channel-booster.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/dispersy-channel-booster.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/channelcast_supporter.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/channelcast_supporter.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/channelcast_supporter.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/globals.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/globals.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/globals.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/metadata-injector.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/metadata-injector.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/metadata-injector.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/notification.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/notification.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/notification.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/search_supporter.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/search_supporter.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/search_supporter.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_lockprofiler.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_lockprofiler.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_lockprofiler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_main.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_main.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_main.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_profiler.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_profiler.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_profiler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/DispersyDebugFrame.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/DispersyDebugFrame.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/DispersyDebugFrame.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/EmbeddedPlayer.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/EmbeddedPlayer.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/EmbeddedPlayer.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/GuiImageManager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/GuiImageManager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/GuiImageManager.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/GuiUtility.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/GuiUtility.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/GuiUtility.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/IconsManager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/IconsManager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/IconsManager.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/MainFrame.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/MainFrame.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/MainFrame.pyo
@@ -883,9 +871,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/bgPanel.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/bgPanel.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/bgPanel.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/channel.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/channel.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/channel.pyo
@@ -895,53 +880,287 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/home.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/home.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/home.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/Search_new.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/Search_new_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/activity.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/add.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/bittorrent.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/bug.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/bullet_go.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/comments.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/defaultThumbPeer.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/close.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/cloud.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/default/comments.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/default/defaultThumbPeer.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/default/edit_diff.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/default/edit_reverted.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/default/file_extension_tor.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/default/file_extension_tornew.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/default/marking.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/delete.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/download.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/edit_diff.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/edit_reverted.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/file_extension_tor.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/file_extension_tornew.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/fire.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/firewallStatus14_state1.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/firewallStatus14_state2.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/firewallStatus14_state3.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/firewallStatus_state1.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/firewallStatus_state2.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/firewallStatus_state3.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/help.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/drive.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/file_default.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/file_video.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ad.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ae.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/af.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ag.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ai.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/al.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/am.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/an.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ao.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ar.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/as.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/at.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/au.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/aw.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ax.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/az.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ba.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bb.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bd.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/be.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bf.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bh.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bi.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bj.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bo.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/br.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bs.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bt.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bv.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bw.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/by.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/bz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ca.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/catalonia.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cc.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cd.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cf.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ch.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ci.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ck.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cl.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/co.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cs.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cu.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cv.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cx.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cy.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/cz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/de.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/dj.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/dk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/dm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/do.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/dz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ec.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ee.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/eg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/eh.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/england.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/er.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/es.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/et.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/europeanunion.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/fam.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/fi.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/fj.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/fk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/fm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/fo.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/fr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ga.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gb.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gd.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ge.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gf.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gh.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gi.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gl.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gp.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gq.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gs.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gt.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gu.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gw.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/gy.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/hk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/hm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/hn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/hr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ht.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/hu.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/id.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ie.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/il.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/in.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/io.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/iq.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ir.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/is.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/it.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/jm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/jo.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/jp.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ke.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/kg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/kh.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ki.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/km.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/kn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/kp.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/kr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/kw.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ky.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/kz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/la.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/lb.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/lc.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/li.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/lk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/lr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ls.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/lt.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/lu.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/lv.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ly.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ma.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mc.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/md.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/me.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mh.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ml.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mo.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mp.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mq.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ms.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mt.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mu.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mv.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mw.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mx.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/my.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/mz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/na.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/nc.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ne.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/nf.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ng.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ni.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/nl.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/no.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/np.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/nr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/nu.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/nz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/om.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pa.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pe.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pf.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ph.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pl.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ps.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pt.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/pw.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/py.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/qa.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/re.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ro.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/rs.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ru.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/rw.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sa.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sb.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sc.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/scotland.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sd.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/se.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sh.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/si.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sj.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sl.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/so.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/st.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sv.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sy.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/sz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tc.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/td.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tf.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/th.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tj.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tl.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/to.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tr.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tt.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tv.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tw.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/tz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ua.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ug.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/um.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/us.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/uy.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/uz.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/va.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/vc.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ve.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/vg.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/vi.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/vn.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/vu.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/wales.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/wf.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ws.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/ye.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/yt.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/za.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/zm.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/flags/zw.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/info.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/library_play.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/license
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/logo4video2.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/logo4video2_win.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/marking.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/maximize.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/minimize.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/ministar.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/ministarEnabled.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/mt.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/mtEnabled.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/mtEnabled_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/mt_clicked.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/mychannel.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/no_activity.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/notify_download.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/notify_favourite.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/notify_magnet.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/notify_seed.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/pause.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/play.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/player.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/progressbarEmpty.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/progressbarFull.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/search_files_channels.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/search_new.gif
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/search_new_windows.gif
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/settings.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/snapshot.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/splash.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/star.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/starEnabled.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/status_dht.png
@@ -950,11 +1169,20 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/status_inact.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/status_sd.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/status_stop.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/stop.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/statusbar_activity.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/statusbar_noactivity.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/statusbar_ok.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/statusbar_warning.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/swift.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/top_search.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_grey.gif
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/wand.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/tribler.ico
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/unused/help.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/upload.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_fullscreen.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_muted.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_pause.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_play.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_stop.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/video_unmuted.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list.pyo
@@ -979,7 +1207,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/settingsDialog.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/settingsDialog.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/settingsDialog.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/settingsDialog.xrc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/validator.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/validator.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/validator.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/widgets.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/widgets.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/widgets.pyo
@@ -987,7 +1217,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/static/LICENSE
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/static/constants.js
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/static/contextmenu.js
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/static/dialogmanager.js
@@ -1094,68 +1323,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/webUI.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/webUI.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/webUI.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/BaseApp.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/BaseApp.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/BaseApp.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/EmbeddedPlayer4Frame.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/EmbeddedPlayer4Frame.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/EmbeddedPlayer4Frame.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/PlayerVideoFrame.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/PlayerVideoFrame.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/PlayerVideoFrame.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/Reporter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/Reporter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/Reporter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/SvcTest.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/SvcTest.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/SvcTest.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/UtilityStub.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/UtilityStub.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/UtilityStub.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/swarmplayer-njaal.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/swarmplayer-njaal.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/swarmplayer-njaal.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/swarmplayer.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/swarmplayer.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/swarmplayer.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/systray.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/systray.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Player/systray.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/AtomFeedParser.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/AtomFeedParser.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/AtomFeedParser.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/BackgroundProcess.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/BackgroundProcess.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/BackgroundProcess.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/Search.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/Search.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/Search.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/SwarmEngine.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/SwarmEngine.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/SwarmEngine.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/defs.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/defs.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/defs.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/examplepage-firefox.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/examplepage.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/pluginemulator-http.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/pluginemulator-http.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/pluginemulator-http.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/pluginemulator.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/pluginemulator.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/pluginemulator.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/searchemulator.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/searchemulator.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/searchemulator.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/searchpage-firefox.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/searchpage-ie.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin/searchpage.html
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/RateManager.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/RateManager.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/RateManager.pyo
@@ -1165,371 +1332,36 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Subscriptions/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Subscriptions/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Subscriptions/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Subscriptions/rss_client.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Subscriptions/rss_client.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Subscriptions/rss_client.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bitbucket-live-noauth.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bitbucket-live-noauth.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bitbucket-live-noauth.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bitbucket-live.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bitbucket-live.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bitbucket-live.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bt2swift.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bt2swift.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/bt2swift.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/btshowmetainfo.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/btshowmetainfo.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/btshowmetainfo.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/cmdlinedl.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/cmdlinedl.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/cmdlinedl.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream-njaal.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream-njaal.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream-njaal.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream-noauth.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream-noauth.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream-noauth.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createlivestream.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createpoa.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createpoa.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createpoa.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createtorrent.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createtorrent.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/createtorrent.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/dirtracker.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/dirtracker.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/dirtracker.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/dirtrackerseeder.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/dirtrackerseeder.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/dirtrackerseeder.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/duration2torrent.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/duration2torrent.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/duration2torrent.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/httpseeder.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/httpseeder.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/httpseeder.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pingbackserver.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pingbackserver.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pingbackserver.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pipe-arnocam-home.sh
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pipe-arnocam-jip.sh
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pipe-babscam-h264-aac-gop-sync.sh
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pipe-babscam-h264-mp3.sh
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pipe-babscam-h264-nosound-mencoder.sh
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/pipe-babscam-mpeg4-mp3-sync.sh
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/proxy-cmdline.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/proxy-cmdline.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/proxy-cmdline.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/seed-njaal.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/seed-njaal.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/seed-njaal.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/seeking.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/seeking.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/seeking.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/stunserver.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/stunserver.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/stunserver.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/superpeer.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/superpeer.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/superpeer.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/swifttest2.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/swifttest2.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/swifttest2.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/swifttest3.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/swifttest3.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/swifttest3.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/trial_poa_server.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/trial_poa_server.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools/trial_poa_server.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TorrentChecking.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TorrentChecking.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TorrentChecking.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerChecking.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerChecking.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerChecking.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerInfoCache.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerInfoCache.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerInfoCache.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerSession.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerSession.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerSession.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerUtility.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerUtility.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TrackerUtility.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/README.txt
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/SwarmEngine.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/SwarmEngine.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/SwarmEngine.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/bgprocess/bgprocessd
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/bgprocess/swarmengined
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/chrome/content/tribe_status_bar.js
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/chrome/content/tribe_status_bar.xul
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/chrome.manifest
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/components/SwarmTransport.js
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/components/TribeChannel.js
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/components/TribeProtocolHandler.js
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/icon.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/ie8.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/install.rdf
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/live-jip.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/lucid-configure-xulrunner191.sh
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/modulix1-live-p2p.ogg.tstream
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/port-to-other-browsers.txt
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/skin/wiki/swarmplugin.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/skin/wiki/swarmplugin_grey.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/skin/wiki/swarmplugin_grey2.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/skin/wiki/wiki.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/skin/wiki/wiki_grey.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/swift.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/test-nofallback.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/tribeIChannel.idl
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/tribeISwarmTransport.idl
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/wikipedia.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/asynchHTTPclient.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/asynchHTTPclient.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/asynchHTTPclient.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/asynchHTTPserver.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/asynchHTTPserver.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/asynchHTTPserver.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/objectconsole.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/objectconsole.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/objectconsole.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/taskrunner.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/taskrunner.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/taskrunner.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/threadhotel.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/threadhotel.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/threadhotel.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnplogger.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnplogger.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnplogger.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnpmarshal.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnpmarshal.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnpmarshal.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnpsoap.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnpsoap.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common/upnpsoap.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/bookmarkservice.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/bookmarkservice.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/bookmarkservice.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/switchpower.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/switchpower.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/switchpower.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/urlservice.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/urlservice.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services/urlservice.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpclient.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpclient.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpclient.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpdaemon.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpdaemon.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpdaemon.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpmessage.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpmessage.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpmessage.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpserver.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpserver.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp/ssdpserver.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/httpserver.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/httpserver.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/httpserver.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpclient.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpclient.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpclient.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpclientconsole.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpclientconsole.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpclientconsole.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpservicestub.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpservicestub.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/upnpservicestub.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/xmldescriptionparser.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/xmldescriptionparser.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient/xmldescriptionparser.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpconsole.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpconsole.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpconsole.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/httpserver.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/httpserver.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/httpserver.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/servicemanager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/servicemanager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/servicemanager.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpdevice.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpdevice.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpdevice.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpeventdispatcher.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpeventdispatcher.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpeventdispatcher.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpserver.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpserver.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpserver.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpserverconsole.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpserverconsole.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpserverconsole.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpservice.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpservice.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver/upnpservice.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/FastI2I.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/FastI2I.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/FastI2I.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/Instance2Instance.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/Instance2Instance.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/Instance2Instance.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/LinuxSingleInstanceChecker.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/LinuxSingleInstanceChecker.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/LinuxSingleInstanceChecker.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/SingleInstanceChecker.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/SingleInstanceChecker.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/SingleInstanceChecker.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/TimedTaskQueue.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/TimedTaskQueue.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/TimedTaskQueue.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/configreader.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/configreader.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities/configreader.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Buttons.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Buttons.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Buttons.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/CachingStream.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/CachingStream.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/CachingStream.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/4framebackground.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/4framesliderDot.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/4framesliderDot_dis.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/4framesliderVolume.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/background.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/bl.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/br.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/fullScreen-hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/fullScreen.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/fullScreen_dis.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/fullScreen_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/pause.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/pause_dis.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/pause_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/play.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/play_dis.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/play_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/sliderDot.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/sliderDot_dis.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/sliderDot_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/sliderVolume.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/stop.pdn
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/stop.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/stop_dis.pdn
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/stop_dis.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/stop_hover.pdn
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/stop_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/tl.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/tr.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol0.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol0Enabled.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol0Enabled_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol0_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol1.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol1Enabled.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol1Enabled_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol1_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol2.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol2Enabled.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol2Enabled_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol2_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol3.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol3Enabled.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol3Enabled_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol3_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol4.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol4Enabled.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol4Enabled_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol4_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol5.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol5Enabled_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol5_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol6.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol6Enabled_clicked.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images/vol6_hover.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Ogg.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Ogg.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Ogg.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Progress.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Progress.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Progress.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VLCWrapper.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VLCWrapper.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VLCWrapper.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoFrame.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoFrame.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoFrame.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoPlayer.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoPlayer.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoPlayer.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoServer.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoServer.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/VideoServer.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/defs.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/defs.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/defs.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/utils.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/utils.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/utils.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/WebUI.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/WebUI.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/WebUI.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/arrows.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/favicon.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/headBG.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/p2p-next.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/pause.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/pause_red.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/progress_blue.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/progress_green.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/progress_red.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/remove.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/remove_big.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/remove_red.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/resume.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/resume_green.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/splugin.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/users_arrow.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/users_arrow_green.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/users_arrow_red.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images/users_arrow_red_light.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/index/body.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/index/head.html
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/index/stylesheet.css
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/javascript/download.js
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/javascript/json.min.js
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/javascript/tribe.interface.js
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/javascript/tribe.js
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/__init__.pyo
@@ -1545,12 +1377,33 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/conversion.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/conversion.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/message.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/message.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/message.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/payload.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/payload.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/payload.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/script.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/script.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel/script.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/database.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/database.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/database.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/efforthistory.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/efforthistory.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/efforthistory.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/script.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/script.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast3/script.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/__init__.pyo
@@ -1569,30 +1422,136 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/preview.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/preview.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/preview.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/script.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/script.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel/script.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/community.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/community.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/community.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/conversion.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/conversion.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/conversion.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/database.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/database.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/database.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/efforthistory.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/efforthistory.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/efforthistory.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/payload.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/payload.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/payload.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/script.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/script.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort/script.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/demers/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/metadata/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/OverlayManager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/OverlayManager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/OverlayManager.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/SearchManager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/SearchManager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/SearchManager.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_average.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_average.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_average.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_randomness.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_randomness.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/oneswarm/tests/test_randomness.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/python27_ordereddict.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/python27_ordereddict.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesearch/python27_ordereddict.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/curves.ec
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecelgamal.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecelgamal.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecelgamal.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecutils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecutils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/ecutils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamal.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamal.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamal.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamalcrypto.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamalcrypto.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/elgamalcrypto.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/optional_crypto.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/optional_crypto.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/optional_crypto.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/paillier.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/paillier.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/paillier.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/polycreate.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/polycreate.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/polycreate.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/rsa.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/rsa.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/crypto/rsa.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/database.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/database.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/database.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/python27_ordereddict.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/python27_ordereddict.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/python27_ordereddict.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/test.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/test.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesemantic/test.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/database.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/database.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/database.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/privatesocial/payload.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search/__init__.pyo
@@ -1620,6 +1579,63 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/template/script.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/template/script.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/template/script.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/server.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/server.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/Socks5/server.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/endpoint.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/endpoint.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/endpoint.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/main.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/main.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/main.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/routing.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/routing.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/routing.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_circuit.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_circuit.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_circuit.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultCrypto.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultCrypto.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultCrypto.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultExitStrategy.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultExitStrategy.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_defaultExitStrategy.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_dispersyBypassEndpoint.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_dispersyBypassEndpoint.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_dispersyBypassEndpoint.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_libtorrent.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_libtorrent.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_libtorrent.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_proxyCommunity.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_proxyCommunity.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_proxyCommunity.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_tunnelExitSocket.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_tunnelExitSocket.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tests/test_tunnelExitSocket.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.pyo
@@ -1629,12 +1645,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/bloomfilter.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/bloomfilter.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/bloomfilter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/bootstrap.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/bootstrap.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/bootstrap.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/callback.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/callback.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/callback.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/candidate.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/candidate.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/candidate.pyo
@@ -1650,18 +1660,24 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/database.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/database.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/database.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/debug.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/debug.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/debug.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/debugcommunity.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/debugcommunity.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/debugcommunity.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/decorator.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/decorator.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/decorator.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/destination.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/destination.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/destination.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/bootstrap.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/bootstrap.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/bootstrap.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/payload.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/dispersy.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/dispersy.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/dispersy.pyo
@@ -1671,15 +1687,28 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/distribution.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/distribution.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/distribution.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/dprint.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/dprint.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/dprint.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/encoding.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/encoding.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/encoding.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/component_permission.org
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/component_synchronisation.org
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/component_walker.org
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/component_walker.pdf
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/filter_code.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/filter_code.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/filter_code.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/image/determine-lan-wan.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/image/walk-identity.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/image/walk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/image/who-to-introduce.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/minimal_bootstrap.diff
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/tutorial-part1.org
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/walk_multiplier.diff
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/wireprotocol_1.org
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/wireprotocol_2.org
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/endpoint.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/endpoint.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/endpoint.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/exception.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/exception.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/exception.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/member.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/member.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/member.pyo
@@ -1692,141 +1721,143 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/payload.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/payload.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/payload.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/python27_ordereddict.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/python27_ordereddict.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/python27_ordereddict.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/requestcache.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/requestcache.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/requestcache.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/resolution.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/resolution.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/resolution.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/revision.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/revision.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/revision.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/script.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/script.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/script.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/selectpoll.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/singleton.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/singleton.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/singleton.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/statistics.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/statistics.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/statistics.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/taskmanager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/taskmanager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/taskmanager.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/node.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/node.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/node.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/debugcommunity/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/dispersytestclass.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/dispersytestclass.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/dispersytestclass.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_batch.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_batch.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_batch.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_bloomfilter.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_bloomfilter.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_bloomfilter.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_bootstrap.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_bootstrap.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_bootstrap.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_candidates.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_candidates.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_candidates.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_classification.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_classification.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_classification.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_crypto.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_crypto.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_crypto.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_destroycommunity.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_destroycommunity.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_destroycommunity.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_dynamicsettings.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_dynamicsettings.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_dynamicsettings.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_identicalpayload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_identicalpayload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_identicalpayload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_member.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_member.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_member.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_missingidentity.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_missingidentity.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_missingidentity.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_missingmessage.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_missingmessage.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_missingmessage.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_nat_detection.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_nat_detection.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_nat_detection.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_neighborhood.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_neighborhood.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_neighborhood.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_overlay.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_overlay.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_overlay.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_pruning.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_pruning.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_pruning.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_requestcache.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_requestcache.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_requestcache.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_sequence.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_sequence.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_sequence.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_signature.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_signature.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_signature.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_sync.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_sync.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_sync.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_timeline.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_timeline.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_timeline.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_undo.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_undo.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_undo.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_walker.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_walker.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_walker.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/timeline.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/timeline.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/timeline.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/callbackscript.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/callbackscript.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/callbackscript.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/ldecoder.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/ldecoder.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/ldecoder.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/createkey.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/createkey.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/createkey.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/lencoder.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/lencoder.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/lencoder.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/main.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/main.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/main.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/scenarioscript.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/scenarioscript.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/scenarioscript.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/test
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/tracker.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/tracker.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/tracker.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/schema_sdb_v17.sql
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tracker/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tracker/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tracker/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tracker/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tracker/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tracker/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/twisted/plugins/tracker_plugin.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/twisted/plugins/tracker_plugin.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/twisted/plugins/tracker_plugin.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/util.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/util.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/util.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/schema_sdb_v22.sql
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/svn_ext_val.txt
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.pyo
 %%PYTHON_SITELIBDIR%%/tribler/swift
-%%PYTHON_SITELIBDIR%%/apsw.so
 libexec/swift
 share/applications/tribler.desktop
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/binary-LICENSE-postfix.txt
-%%PORTDOCS%%%%DOCSDIR%%/ns-LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 share/pixmaps/tribler.xpm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/template
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/effort
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/channel
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/allchannel
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/community
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/javascript
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/index
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI/images
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/WebUI
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Video/Images
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Video
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Utilities
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpserver
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/upnpclient
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/ssdp
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/services
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP/common
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/UPnP
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/skin/wiki
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/skin
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/components
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/chrome/content
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/chrome
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport/bgprocess
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Transport
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Tools
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Subscriptions
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Plugin
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Player
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/static/lang
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/static/images
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI/static
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/webUI
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Lang
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Images
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Video
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Tag
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Swift
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/SocialNetwork
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ProxyService
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Overlay
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/NATFirewall
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Multicast
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Merkle
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/core
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/MagnetLink
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/ClosedSwarm
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/CacheDB
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado/BT1
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/BitTornado
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category
-@dirrm %%PYTHON_SITELIBDIR%%/tribler/Tribler
-@dirrm %%PYTHON_SITELIBDIR%%/tribler