diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index db5e08df53f2..2f33c1e749cd 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -1,92 +1,93 @@
 PORTNAME=	tor-browser
-DISTVERSION=	12.0-2
-PORTREVISION=	2
+DISTVERSION=	12.0.2
+PORTREVISION=	3 # previous DISTVERSION was 12.0-2 which becomes 12.0.2 too in PGKNAME
 CATEGORIES=	www net security wayland
-MASTER_SITES=	https://dist.torproject.org/torbrowser/12.0/
-DISTNAME=	src-firefox-tor-browser-102.5.0esr-${DISTVERSION}-build1
+MASTER_SITES=	MASTER_SITE_TOR
+MASTER_SITE_SUBDIR=torbrowser/${DISTVERSION}
+DISTNAME=	src-firefox-tor-browser-102.7.0esr-${DISTVERSION:R}-1-build1
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Tor Browser for FreeBSD
 WWW=		https://www.torproject.org/
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		nss>=3.79.1:security/nss \
 		icu>=71.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=4.1.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.37:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.11.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf2.13:devel/autoconf2.13 \
 		nasm:devel/nasm \
 		yasm:devel/yasm \
 		zip:archivers/zip
 RUN_DEPENDS=	tor:security/tor \
 		obfs4proxy:security/obfs4proxy-tor
 
 USES=		compiler:c++11-lib libtool \
 		perl5 pkgconfig python:3.4+ shebangfix localbase:ldflags tar:xz
 USE_GECKO=	gecko
 
 SSP_UNSAFE=	yes
 
 SUB_FILES=	torrc-defaults tor-browser.desktop
 BUNDLE_LIBS=	yes
 
 USE_MOZILLA=	-sqlite
 CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
 		MOZ_BRANDING_DIRECTORY="browser/branding/official"
 
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
 		MOZ_APP_DISPLAYNAME="Tor Browser" \
 		MOZ_APP_NAME="tor-browser"
 
-MOZ_OPTIONS=	--with-tor-browser-version=12.0-2 \
+MOZ_OPTIONS=	--with-tor-browser-version="${DISTVERSION}-1" \
 	--enable-official-branding \
 	--enable-optimize \
 	--enable-rust-simd \
 	--enable-bundled-fonts \
 	--disable-tests \
 	--disable-debug \
 	--disable-crashreporter \
 	--disable-webrtc \
 	--disable-parental-controls \
 	--enable-proxy-bypass-protection \
 	--disable-system-policies \
 	--disable-backgroundtasks \
 	--enable-base-browser \
 	--enable-verify-mar \
 	--with-distribution-id=org.torproject
 
-WRKSRC=		${WRKDIR}/firefox-tor-browser-102.5.0esr-12.0-2-build1
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 
 .include	"${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64
 MOZ_OPTIONS+=	--disable-webrtc --without-wasm-sandboxed-libraries
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \
 		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
 		${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT}
 MOZILLA_PLIST_DIRS=	bin lib share/pixmaps share/applications share/tor-browser
 MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 post-patch:
 	@${REINPLACE_CMD} 's|LOCALBASE|${LOCALBASE}|g' "${WRKSRC}/browser/app/profile/000-tor-browser.js"
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13)
 	@${REINPLACE_CMD} 's|export MOZ_GOOGLE_.*||g' ${WRKSRC}/.mozconfig
 	@${REINPLACE_CMD} 's|ac_add_options --enable-update-channel=release||g' ${WRKSRC}/.mozconfig
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/torrc-defaults ${STAGEDIR}${DATADIR}/torrc-defaults
 	${INSTALL_DATA} ${WRKDIR}/tor-browser.desktop ${STAGEDIR}${PREFIX}/share/applications/tor-browser.desktop
 .include <bsd.port.mk>
diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo
index d0cf1eca7eec..decaa1298c6f 100644
--- a/www/tor-browser/distinfo
+++ b/www/tor-browser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670876006
-SHA256 (src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) = d65013d724f6002b01473e7cd34a11728dcf5e3390bb7165018c1f42e42e82d4
-SIZE (src-firefox-tor-browser-102.5.0esr-12.0-2-build1.tar.xz) = 512766100
+TIMESTAMP = 1674405921
+SHA256 (src-firefox-tor-browser-102.7.0esr-12.0-1-build1.tar.xz) = da8c3a9775f4f808ea78428cadbe848d0f2fdf26a6c193b3452590e24f557bf3
+SIZE (src-firefox-tor-browser-102.7.0esr-12.0-1-build1.tar.xz) = 511809384
diff --git a/www/tor-browser/files/patch-bug1773070 b/www/tor-browser/files/patch-bug1773070
deleted file mode 100644
index 0c1b3c4dac0e..000000000000
--- a/www/tor-browser/files/patch-bug1773070
+++ /dev/null
@@ -1,26 +0,0 @@
-In file included from Unified_cpp_accessible_html0.cpp:29:
-In file included from accessible/html/HTMLImageMapAccessible.cpp:14:
-In file included from layout/generic/nsImageFrame.h:17:
-In file included from ../.build/dist/include/nsDisplayList.h:48:
-In file included from ../.build/dist/include/nsCSSRenderingBorders.h:20:
-In file included from ../.build/dist/include/gfxUtils.h:23:
-In file included from ../.build/dist/include/mozilla/webrender/WebRenderTypes.h:11:
-In file included from ../.build/dist/include/mozilla/webrender/webrender_ffi.h:103:
-../.build/dist/include/mozilla/webrender/webrender_ffi_generated.h:24:33: error: redefinition of 'ROOT_CLIP_CHAIN'
-constexpr static const uint64_t ROOT_CLIP_CHAIN = ~0;
-                                ^
-../.build/dist/include/mozilla/webrender/webrender_ffi.h:75:16: note: previous definition is here
-const uint64_t ROOT_CLIP_CHAIN = ~0;
-               ^
-
---- gfx/webrender_bindings/webrender_ffi.h.orig	2022-06-08 21:06:36 UTC
-+++ gfx/webrender_bindings/webrender_ffi.h
-@@ -72,8 +72,6 @@ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpo
- struct WrPipelineIdAndEpoch;
- using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
- 
--const uint64_t ROOT_CLIP_CHAIN = ~0;
--
- }  // namespace wr
- }  // namespace mozilla
-