Index: head/security/tor/Makefile
===================================================================
--- head/security/tor/Makefile	(revision 451057)
+++ head/security/tor/Makefile	(revision 451058)
@@ -1,123 +1,133 @@
 # Created by: peter.thoenen@yahoo.com
 # $FreeBSD$
 
 PORTNAME=	tor
-PORTVERSION=	0.3.0.10
-PORTREVISION=	1
+PORTVERSION=	0.3.1.7
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	Anonymizing overlay network for TCP
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_mips64=		does not build: error: Need a uint128_t implementation!
 BROKEN_powerpc64=	does not build: error: Need a uint128_t implementation!
 BROKEN_sparc64=		does not build: error: Need a uint128_t implementation!
 
 USES=		cpe gmake pkgconfig
 CPE_VENDOR=	torproject
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}"
 CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
 OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB
-OPTIONS_DEFAULT=MANPAGES
+OPTIONS_GROUP=	COMPRESSION
+OPTIONS_GROUP_COMPRESSION=ZSTD LZMA
+OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
 OPTIONS_SUB=	yes
-
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
 TOR2WEB_DESC=		(EXPERT OPTION) Faster but non-anonymous hidden services
+COMPRESSION_DESC=	Supported compression libraries
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
 PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"
 
 GROUPS=		_tor
 USERS=		_tor
 
-CONFLICTS=	tor-devel-[0-9]*
+CONFLICTS_INSTALL=	tor-devel-[0-9]*
 
 STATIC_TOR_USES=	ssl:build
 STATIC_TOR_USES_OFF=	ssl
 
+TOR2WEB_CONFIGURE_ENABLE=	tor2web-mode
+ZSTD_CONFIGURE_ENABLE=		zstd
+ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}"
+LZMA_CONFIGURE_ENABLE=		lzma
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	asciidoc:textproc/asciidoc
 .else
 CONFIGURE_ARGS+=	--disable-asciidoc
 .endif
 
 .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
 empty(PORT_OPTIONS:MSTATIC_TOR)
 CONFIGURE_ARGS+=	--enable-gcc-hardening
 .else
 CONFIGURE_ARGS+=	--disable-gcc-hardening
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
+.  if ${PORT_OPTIONS:MZSTD}
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libzstd.a:archivers/zstd
+TOR_ZSTD_LIBS=		${LOCALBASE}/lib/libzstd.a
+.  endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
 LIB_DEPENDS+=		libevent.so:devel/libevent
 TOR_LIBEVENT_LIBS=	-levent
+.  if ${PORT_OPTIONS:MZSTD}
+LIB_DEPENDS+=		libzstd.so:archivers/zstd
+TOR_ZSTD_LIBS=		-lzstd
+.  endif
 .endif
 
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
 .else
 LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
-.endif
-
-.if ${PORT_OPTIONS:MTOR2WEB}
-CONFIGURE_ARGS+=	--enable-tor2web-mode
 .endif
 
 pre-everything::
 .if ${PORT_OPTIONS:MTOR2WEB}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Warning: The expert option 'tor2web' is chosen."
 	@${ECHO_MSG} "         With this option tor cannot be used for regular traffic,"
 	@${ECHO_MSG} "         only for non-anonymous hidden service traffic."
 	@${ECHO_MSG} "         Please make sure you understand this option."
 	@${ECHO_MSG}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \
 		${WRKSRC}/src/config/torrc.*.in \
 		${WRKSRC}/doc/tor.1.* \
 		${WRKSRC}/doc/tor.html.in
 
 post-patch-STATIC_TOR-off:
 	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
 		${WRKSRC}/configure
 
 post-patch-STATIC_TOR-on:
 	@${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \
 		${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor
 
 .if ! ${PORT_OPTIONS:MTOR2WEB}
 check regression-test test: build
 	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS} check
 .endif
 
 .include <bsd.port.mk>
Index: head/security/tor/distinfo
===================================================================
--- head/security/tor/distinfo	(revision 451057)
+++ head/security/tor/distinfo	(revision 451058)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502098144
-SHA256 (tor-0.3.0.10.tar.gz) = 9a8e6e49a1688dae64dca10f84a414ec9a4f393fb2256ae28e0c2e3239185ab1
-SIZE (tor-0.3.0.10.tar.gz) = 5845205
+TIMESTAMP = 1505762209
+SHA256 (tor-0.3.1.7.tar.gz) = 1df5dd4894bb2f5e0dc96c466955146353cf33ac50cd997cfc1b28ea3ed9c08f
+SIZE (tor-0.3.1.7.tar.gz) = 6058284