Index: security/tor/Makefile
===================================================================
--- security/tor/Makefile	(revision 423641)
+++ security/tor/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tor
-PORTVERSION=	0.2.8.7
-PORTREVISION=	1
+PORTVERSION=	0.2.8.9
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 
@@ -29,7 +28,7 @@
 
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
-TOR2WEB_DESC=		Faster but non-anonymous hidden services
+TOR2WEB_DESC=		(EXPERT OPTION) Faster but non-anonymous hidden services
 TRANSPARENT_DESC=	Transparent proxy support
 
 OPTIONS_DEFAULT=	TRANSPARENT
@@ -36,6 +35,8 @@
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
+SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
+PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"
 
 GROUPS=		_tor
 USERS=		_tor
@@ -88,6 +89,16 @@
 CONFIGURE_ARGS+=	--disable-transparent
 .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
@@ -109,7 +120,7 @@
 		${WRKSRC}/Makefile
 
 post-install:
-	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor
+	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor
 
 .if ! ${PORT_OPTIONS:MTOR2WEB}
 check regression-test test: build
Index: security/tor/distinfo
===================================================================
--- security/tor/distinfo	(revision 423641)
+++ security/tor/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472080840
-SHA256 (tor-0.2.8.7.tar.gz) = ae44e2b699e82db7ff318432fd558dfa941ad154e4055f16d208514951742fc6
-SIZE (tor-0.2.8.7.tar.gz) = 5179093
+TIMESTAMP = 1476740628
+SHA256 (tor-0.2.8.9.tar.gz) = 3f5c273bb887be4aff11f4d99b9e2e52d293b81ff4f6302b730161ff16dc5316
+SIZE (tor-0.2.8.9.tar.gz) = 5306773
Index: security/tor/files/tor.in
===================================================================
--- security/tor/files/tor.in	(revision 423641)
+++ security/tor/files/tor.in	(working copy)
@@ -26,7 +26,7 @@
 
 : ${tor_enable="NO"}
 : ${tor_conf="%%PREFIX%%/etc/tor/torrc"}
-: ${tor_user="_tor"}
+: ${tor_user="%%USER%%"}
 : ${tor_pidfile="/var/run/tor/tor.pid"}
 : ${tor_datadir="/var/db/tor"}
 
Index: security/tor/pkg-plist
===================================================================
--- security/tor/pkg-plist	(revision 423641)
+++ security/tor/pkg-plist	(working copy)
@@ -9,5 +9,6 @@
 man/man1/torify.1.gz
 %%DATADIR%%/geoip
 %%DATADIR%%/geoip6
-@dir(_tor,_tor,750) /var/run/tor
-@dir(_tor,_tor,750) /var/log/tor
+@dir(%%USER%%,%%GROUP%%,700) /var/run/tor
+@dir(%%USER%%,%%GROUP%%,700) /var/log/tor
+@dir(%%USER%%,%%GROUP%%,700) /var/db/tor