5 files changed, 441 insertions, 280 deletions

diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 1c25976258cb..cda84b397de2 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	tribler
-PORTVERSION=	6.4.3
-PORTREVISION=	2
+PORTVERSION=	6.5.1
 CATEGORIES=	net-p2p
-MASTER_SITES=	https://github.com/Tribler/tribler/releases/download/${PORTVERSION:S/^/v/}/
-DISTFILES=	${PORTNAME}_${PORTVERSION}_all.deb
+MASTER_SITES=	https://github.com/Tribler/tribler/releases/download/v${PORTVERSION}/
+DISTNAME=	Tribler-v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Streaming capable P2P network client based on BitTorrent
@@ -14,13 +13,16 @@ COMMENT=	Streaming capable P2P network client based on BitTorrent
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi
 
+BUILD_DEPENDS=	xpmtoppm:graphics/netpbm
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw \
+		${PYTHON_PKGNAMEPREFIX}leveldb>0:databases/py-leveldb \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
 		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.16.4:net-p2p/libtorrent-rasterbar-python \
+		libsodium>0:security/libsodium \
 		${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser \
@@ -28,24 +30,17 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 NO_ARCH=	yes
-NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-USES=		desktop-file-utils 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
+USES=		desktop-file-utils python:2,run tar:xz twisted:run,web
 USE_OPENSSL=	yes
-USE_PYTHON=	run
 USE_WX=		2.8
 WX_COMPS=	python
+INSTALLS_ICONS=	yes
 
-CFLAGS+=	-D__STDC_LIMIT_MACROS=1
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+SUB_FILES=	tribler
+SUB_LIST=	PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR}" \
+		PYTHON_VERSION="${PYTHON_VERSION}"
 
 OPTIONS_DEFINE=		DOCS VLC
 OPTIONS_DEFAULT=	VLC
@@ -54,46 +49,49 @@ VLC_DESC=		Multimedia support via VLC
 VLC_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 			vlc:multimedia/vlc
 
-TRIBLER_DIR=	${PYTHONPREFIX_SITELIBDIR}/tribler
-
-post-extract:
-	@(cd ${WRKSRC} && ${TAR} -xf data.tar.xz)
-
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|%%OPSYS%%|${OPSYS}| ; \
-		 s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}| ; \
-		 s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' \
-		${WRKSRC}/usr/bin/tribler
-	@${REINPLACE_CMD} -e \
 		's|Application;|| ; \
 		 /^Categories/s|$$|;| ; \
 		 /^MimeType/s|$$|;|' \
-		${WRKSRC}/usr/share/applications/tribler.desktop
-	@${REINPLACE_CMD} -i '' -e \
+		${WRKSRC}/tribler/Tribler/Main/Build/Ubuntu/tribler.desktop
+	@${REINPLACE_CMD} -e \
 		's|linux|${OPSYS:tl}|' \
-		${WRKSRC}/usr/share/tribler/Tribler/vlc.py
+		${WRKSRC}/tribler/Tribler/vlc.py
+
+do-build:
+	@${MKDIR} ${WRKDIR}/icons/hicolor/32x32/apps
+	(cd ${WRKDIR} && xpmtoppm --alphaout=tribler.pgm \
+		${WRKSRC}/tribler/Tribler/Main/Build/Ubuntu/tribler.xpm \
+		> tribler.ppm)
+	(cd ${WRKDIR} && pnmtopng -alpha=tribler.pgm tribler.ppm \
+		> ${WRKDIR}/icons/hicolor/32x32/apps/tribler.png)
+	@${MKDIR} ${WRKDIR}/icons/hicolor/48x48/apps
+	(cd ${WRKDIR} && xpmtoppm --alphaout=tribler_big.pgm \
+		${WRKSRC}/tribler/Tribler/Main/Build/Ubuntu/tribler_big.xpm \
+		> tribler_big.ppm)
+	(cd ${WRKDIR} && pnmtopng -alpha=tribler_big.pgm tribler_big.ppm \
+		> ${WRKDIR}/icons/hicolor/48x48/apps/tribler.png)
 
 do-install:
-	(cd ${WRKSRC}/usr/bin && ${INSTALL_SCRIPT} tribler \
+	(cd ${WRKDIR} && ${INSTALL_SCRIPT} tribler \
 		${STAGEDIR}${PREFIX}/bin)
-	@${MKDIR} ${STAGEDIR}${TRIBLER_DIR}/Tribler
-	@(${TAR} -C ${WRKSRC}/usr/share/tribler/Tribler \
-		--exclude "Build" \
-		--exclude "LGPL-2.1.txt" \
-		--exclude "SwiftEngine" \
-		--exclude "readme.txt" \
-		--exclude "*LICENSE*.txt" \
-		--exclude "*.orig" \
-		-cf - . | ${TAR} -C ${STAGEDIR}${TRIBLER_DIR}/Tribler -xf -)
-	@${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type f -print0 | \
-		${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	@${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type d -print0 | \
-		${XARGS} -0 ${CHMOD} a+rx
-	${INSTALL_DATA} ${WRKSRC}/usr/share/applications/*.desktop \
-		${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/*.xpm \
-		${STAGEDIR}${PREFIX}/share/pixmaps
+	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tribler
+	(cd ${WRKSRC}/tribler && ${INSTALL_DATA} logger.conf \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tribler)
+	@(cd ${WRKSRC}/tribler/Tribler && ${COPYTREE_SHARE} \
+		"Category Core Test Utilities community dispersy" \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tribler/Tribler)
+	@(cd ${WRKSRC}/tribler/Tribler/Main && ${COPYTREE_SHARE} "[^B]*" \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tribler/Tribler/Main)
+	(cd ${WRKSRC}/tribler/Tribler && ${INSTALL_DATA} *.sql *.py \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tribler/Tribler)
+	(cd ${WRKSRC}/tribler/Tribler/Main/Build/Ubuntu && ${INSTALL_MAN} \
+		tribler.1 ${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${WRKSRC}/tribler/Tribler/Main/Build/Ubuntu && ${INSTALL_DATA} \
+		tribler.desktop ${STAGEDIR}${PREFIX}/share/applications)
+	@(cd ${WRKDIR} && ${COPYTREE_SHARE} icons \
+		${STAGEDIR}${PREFIX}/share)
 	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
@@ -103,7 +101,7 @@ do-install:
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/usr/share/tribler/Tribler && ${INSTALL_DATA} \
-		*LICENSE*.txt readme.txt ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/tribler/Tribler/*.txt \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/tribler/distinfo b/net-p2p/tribler/distinfo
index ba6bf851ef33..c5c117468a90 100644
--- a/net-p2p/tribler/distinfo
+++ b/net-p2p/tribler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tribler_6.4.3_all.deb) = 80dc3e44adb0edc7a77ce85475a6bddfd693666afcaefa2b1dfbf9d6721be814
-SIZE (tribler_6.4.3_all.deb) = 3568984
+SHA256 (Tribler-v6.5.1.tar.xz) = 6ad240c1cfebc0b141657a023d5c21640fdf1a76bd738a433c6323f47a89fedd
+SIZE (Tribler-v6.5.1.tar.xz) = 10141936
diff --git a/net-p2p/tribler/files/patch-tribler b/net-p2p/tribler/files/patch-tribler
deleted file mode 100644
index e6f210a9f180..000000000000
--- a/net-p2p/tribler/files/patch-tribler
+++ /dev/null
@@ -1,18 +0,0 @@
---- usr/bin/tribler.orig	2012-02-08 00:33:48.000000000 +0900
-+++ usr/bin/tribler	2012-02-24 18:46:06.000000000 +0900
-@@ -1,10 +1,12 @@
- #!/bin/sh
--# Startup script for Ubuntu Linux
-+# Startup script for %%OPSYS%%
- 
--_TRIBLERPATH="/usr/share/tribler"
-+_TRIBLERPATH="%%PYTHON_SITELIBDIR%%/tribler"
- 
- export PYTHONPATH="$PYTHONPATH":$_TRIBLERPATH
- 
- echo "Starting Tribler..."
-+STATEDIR="$HOME/.Tribler"
-+[ ! -d $STATEDIR ] && mkdir -p $STATEDIR
- cd $_TRIBLERPATH
--exec python -O Tribler/Main/tribler.py "$@" > /tmp/$USER-tribler.log 2>&1
-+exec %%PYTHON_VERSION%% -O Tribler/Main/tribler.py "$@" > $STATEDIR/tribler.log 2>&1
diff --git a/net-p2p/tribler/files/tribler.in b/net-p2p/tribler/files/tribler.in
new file mode 100644
index 000000000000..1a67dc5f8c6b
--- /dev/null
+++ b/net-p2p/tribler/files/tribler.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+ 
+_TRIBLERPATH="%%PYTHON_SITELIBDIR%%/tribler"
+ 
+export PYTHONPATH="$PYTHONPATH":$_TRIBLERPATH
+ 
+echo "Starting Tribler..."
+STATEDIR="$HOME/.Tribler"
+[ ! -d $STATEDIR ] && mkdir -p $STATEDIR
+cd $_TRIBLERPATH
+exec %%PYTHON_VERSION%% -O Tribler/Main/tribler.py "$@" > $STATEDIR/tribler.log 2>&1
diff --git a/net-p2p/tribler/pkg-plist b/net-p2p/tribler/pkg-plist
index a65dce8ff53b..25d7ea6fec38 100644
--- a/net-p2p/tribler/pkg-plist
+++ b/net-p2p/tribler/pkg-plist
@@ -13,31 +13,21 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Category/init_category.py
 %%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/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/ThreadPool.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/ThreadPool.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/ThreadPool.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/UserCallbackHandler.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/UserCallbackHandler.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/UserCallbackHandler.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/maketorrent.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/maketorrent.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/maketorrent.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/makeurl.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/makeurl.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/makeurl.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/miscutils.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/miscutils.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/miscutils.pyo
-%%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/APIImplementation/threadpoolmanager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/threadpoolmanager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/APIImplementation/threadpoolmanager.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
@@ -59,7 +49,10 @@ bin/tribler
 %%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/pymdht/.gitignore
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/CHANGES.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/LGPL-2.1.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/DecentralizedTracking/pymdht/LICENSE.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
@@ -561,75 +554,33 @@ bin/tribler
 %%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/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/Modules/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/cache.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/cache.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/cache.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/channel_manager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/channel_manager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/channel_manager.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/channel_rss.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/channel_rss.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/channel_rss.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/search_manager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/search_manager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/search_manager.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/tracker_manager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/tracker_manager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Modules/tracker_manager.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/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/Reranking.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/Reranking.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/Reranking.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/SearchManager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/SearchManager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Search/SearchManager.pyo
-%%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/Statistics/Status/LivingLabReporter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/LivingLabReporter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/LivingLabReporter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/NullReporter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/NullReporter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/NullReporter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/ProxyTestReporter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/ProxyTestReporter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/ProxyTestReporter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/Status.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/Status.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/Status.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/TUDelftReporter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/TUDelftReporter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/TUDelftReporter.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/XmlPrinter.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/XmlPrinter.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/Status/XmlPrinter.pyo
-%%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/__init__.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Statistics/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/__init__.pyo
@@ -645,6 +596,15 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/session.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/session.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TFTP/session.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/session.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/session.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/session.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/torrent_checker.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/torrent_checker.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentChecker/torrent_checker.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentDef.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentDef.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/TorrentDef.pyo
@@ -657,42 +617,51 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade64.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade64.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade64.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade65.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade65.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/torrent_upgrade65.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/upgrade.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/upgrade.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Upgrade/upgrade.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/Crypto.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/Crypto.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/Crypto.pyo
 %%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/install_dir.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/install_dir.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/install_dir.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/instrumentation.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/instrumentation.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/instrumentation.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/misc_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/misc_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/misc_utils.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/search_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/search_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/search_utils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/sort_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/sort_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/sort_utils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/torrent_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/torrent_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/torrent_utils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/tracker_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/tracker_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/tracker_utils.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/twisted_utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/twisted_utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/Utilities/twisted_utils.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
@@ -732,42 +701,39 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/exceptions.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/exceptions.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/leveldbstore.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/leveldbstore.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/leveldbstore.pyo
 %%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/plyveladapter.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/plyveladapter.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/plyveladapter.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/statistics.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/statistics.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Core/statistics.pyo
 %%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
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/console.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/console.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Debug/console.pyo
-%%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/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/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
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/CreateTorrentDialog.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/CreateTorrentDialog.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/CreateTorrentDialog.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/FeedbackWindow.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/FeedbackWindow.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/FeedbackWindow.pyo
-%%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/RemoveTorrent.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/RemoveTorrent.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/RemoveTorrent.pyo
@@ -783,6 +749,12 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/systray.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/systray.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Dialogs/systray.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Emercoin/EmercoinMgr.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Emercoin/EmercoinMgr.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Emercoin/EmercoinMgr.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Emercoin/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Emercoin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Emercoin/__init__.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/Feeds/__init__.pyo
@@ -807,6 +779,9 @@ bin/tribler
 %%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/Utility/version_check.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/version_check.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/Utility/version_check.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/__init__.pyo
@@ -816,6 +791,9 @@ bin/tribler
 %%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/hacks.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/hacks.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/hacks.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
@@ -825,6 +803,9 @@ bin/tribler
 %%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_exe.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_exe.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/tribler_exe.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
@@ -861,9 +842,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TopSearchPanel.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TopSearchPanel.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TopSearchPanel.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TorrentStateManager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TorrentStateManager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TorrentStateManager.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TriblerUpgradeDialog.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TriblerUpgradeDialog.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/TriblerUpgradeDialog.pyo
@@ -887,7 +865,9 @@ bin/tribler
 %%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/close.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/closescreen.png
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/cloud.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/darknet.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
@@ -1148,6 +1128,8 @@ bin/tribler
 %%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/license
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/images/lock.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/mychannel.png
@@ -1197,9 +1179,6 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_body.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_body.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_body.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_bundle.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_bundle.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_bundle.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_details.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_details.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/list_details.pyo
@@ -1221,10 +1200,10 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/widgets.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/widgets.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/widgets.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Main/vwxGUI/zudeo_torrent_description.txt
 %%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
@@ -1331,39 +1310,147 @@ 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/Policies/RateManager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/RateManager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/RateManager.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/SeedingManager.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/SeedingManager.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/Policies/SeedingManager.pyo
-%%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/TrackerChecking/TorrentChecking.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TorrentChecking.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/TrackerChecking/TorrentChecking.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/Test/API/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/contentdir/file.txt
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/contentdir/video.avi
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/ec.pem
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/ecpub.pem
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/file.wmv
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_api.bat
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_api.sh
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_seeding.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_seeding.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_seeding.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_seeding_vod.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_seeding_vod.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_seeding_vod.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_tdef.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_tdef.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/test_tdef.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/thumb.jpg
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/video.avi
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/API/video2.avi
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/bak_tribler_sdb.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/bak_tribler_sdb.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/bak_tribler_sdb.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/btconn.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/btconn.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/btconn.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/common.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/common.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/common.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/41aea20908363a80d44234e8fef07fab506cd3b4.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/41aea20908363a80d44234e8fef07fab506cd3b4/421px-Pots_10k_100k.jpeg
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/41aea20908363a80d44234e8fef07fab506cd3b4/Potentiometer_100K_ohm.jpeg
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/45a647b1120ed9fe7f793e17585efb4b0efdf1a5.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/Night.Of.The.Living.Dead_1080p_archive.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/Pioneer.One.S01E01.REDUX.720p.x264-VODO.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/Pioneer.One.S01E06.720p.x264-VODO.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/Prebloc.2010.Xvid-VODO.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/bak_multiple.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/bak_new_tribler.sdb.tar.gz
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/bak_old_tribler.sdb.tar.gz
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/bak_single.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/private.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/ubuntu-15.04-desktop-amd64.iso.torrent
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/data/video.avi
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test.bat
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test.sh
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_as_server.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_as_server.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_as_server.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_bartercast4_community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_bartercast4_community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_bartercast4_community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_bartercast4_statistics.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_bartercast4_statistics.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_bartercast4_statistics.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_gui_dialogs.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_gui_dialogs.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_gui_dialogs.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_gui_general.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_gui_general.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_gui_general.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_hidden_community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_hidden_community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_hidden_community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_i2i.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_i2i.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_i2i.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_leveldb_store.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_leveldb_store.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_leveldb_store.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_leveldb_store_plyvel.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_leveldb_store_plyvel.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_leveldb_store_plyvel.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_libtorrent_download.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_libtorrent_download.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_libtorrent_download.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_magnetlink.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_magnetlink.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_magnetlink.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_metadata_community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_metadata_community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_metadata_community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_my_channel.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_my_channel.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_my_channel.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_osutils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_osutils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_osutils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_remote_search.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_remote_search.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_remote_search.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_remote_torrent_handler.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_remote_torrent_handler.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_remote_torrent_handler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedb.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedb.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedb.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedb_upgrade.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedb_upgrade.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedb_upgrade.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedbhandler.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedbhandler.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_sqlitecachedbhandler.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_torrent.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_torrent.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_torrent.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_torrent_checking.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_torrent_checking.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_torrent_checking.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_base.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_base.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_base.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_community_negative.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_community_negative.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_community_negative.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_community_positive.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_community_positive.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_tunnel_community_positive.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_twisted_rawserver.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_twisted_rawserver.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_twisted_rawserver.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_video_server.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_video_server.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_video_server.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_vod.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_vod.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/test_vod.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/util.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/util.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/Test/util.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/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
@@ -1388,27 +1475,21 @@ bin/tribler
 %%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/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/bartercast4/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/conversion.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/conversion.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/conversion.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/payload.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/payload.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/payload.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/statistics.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/statistics.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/bartercast4/statistics.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
@@ -1439,18 +1520,6 @@ bin/tribler
 %%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/search/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/search/__init__.pyo
@@ -1490,9 +1559,6 @@ bin/tribler
 %%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
@@ -1502,19 +1568,12 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/cryptowrapper.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/cryptowrapper.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/cryptowrapper.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/curves.ec
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecelgamal.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecelgamal.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecelgamal.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecutils.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecutils.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/ecutils.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/elgamalcrypto.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/elgamalcrypto.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/elgamalcrypto.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/tunnelcrypto.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/tunnelcrypto.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/crypto/tunnelcrypto.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/hidden_community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/hidden_community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/hidden_community.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
@@ -1524,27 +1583,11 @@ bin/tribler
 %%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_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/community/tunnel/tunnel_community.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tunnel_community.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tunnel_community.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/.gitignore
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/.gitmodules
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.pyo
@@ -1618,6 +1661,119 @@ bin/tribler
 %%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/libnacl/.gitignore
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/.pylintrc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/.testing.pylintrc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/AUTHORS
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/LICENSE
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/MANIFEST.in
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/README.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/Makefile
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/conf.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/conf.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/conf.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/index.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/dual.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/public.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/raw_generichash.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/raw_hash.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/raw_public.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/raw_secret.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/raw_sign.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.0.0.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.1.0.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.2.0.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.3.0.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.3.1.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.3.2.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.3.3.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.3.4.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.4.0.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/index.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/secret.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/sign.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/utils.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/base.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/base.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/base.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/blake.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/blake.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/blake.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/dual.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/dual.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/dual.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/encode.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/encode.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/encode.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/public.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/public.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/public.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/secret.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/secret.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/secret.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/sign.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/sign.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/sign.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/utils.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/utils.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/utils.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/version.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/version.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/libnacl/version.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/pkg/rpm/python-libnacl.spec
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/pkg/suse/python-libnacl.changes
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/pkg/suse/python-libnacl.spec
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/setup.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/setup.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/setup.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/runtests.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/runtests.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/runtests.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/__init__.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/__init__.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_blake.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_blake.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_blake.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_dual.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_dual.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_dual.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_public.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_public.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_public.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_auth_sym.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_auth_sym.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_auth_sym.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_generichash.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_generichash.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_generichash.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_hash.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_hash.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_hash.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_public.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_public.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_public.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_random.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_random.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_random.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_sign.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_sign.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_sign.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_save.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_save.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_save.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_secret.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_secret.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_secret.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_sign.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_sign.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_sign.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_version.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_version.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_version.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/member.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/member.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/member.pyo
@@ -1636,6 +1792,8 @@ bin/tribler
 %%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/scripts/dispersy-tracker@.service
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/scripts/start_tracker.sh
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/statistics.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/statistics.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/statistics.pyo
@@ -1684,6 +1842,12 @@ bin/tribler
 %%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_discovery.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_discovery.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_discovery.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_double_signature.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_double_signature.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_double_signature.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
@@ -1723,6 +1887,9 @@ bin/tribler
 %%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_taskmanager.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_taskmanager.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_taskmanager.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
@@ -1759,12 +1926,15 @@ bin/tribler
 %%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_v24.sql
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/schema_sdb_v28.sql
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/vlc.pyo
+%%PYTHON_SITELIBDIR%%/tribler/logger.conf
+man/man1/tribler.1.gz
 share/applications/tribler.desktop
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/binary-LICENSE-postfix.txt
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
-share/pixmaps/tribler.xpm
-share/pixmaps/tribler_big.xpm
+share/icons/hicolor/32x32/apps/tribler.png
+share/icons/hicolor/48x48/apps/tribler.png