diff --git a/net-vpn/tor/patches/tor-0.3.3.6.patchset b/net-vpn/tor/patches/tor-0.3.3.7.patchset
similarity index 94%
rename from net-vpn/tor/patches/tor-0.3.3.6.patchset
rename to net-vpn/tor/patches/tor-0.3.3.7.patchset
index a99ab41b2..5bf38effb 100644
--- a/net-vpn/tor/patches/tor-0.3.3.6.patchset
+++ b/net-vpn/tor/patches/tor-0.3.3.7.patchset
@@ -5,7 +5,7 @@ Subject: fix missing IFF_RUNNING
 
 
 diff --git a/src/common/address.c b/src/common/address.c
-index 2693239..029fc1d 100644
+index ecdbbab..de98e81 100644
 --- a/src/common/address.c
 +++ b/src/common/address.c
 @@ -85,6 +85,10 @@
@@ -20,7 +20,7 @@ index 2693239..029fc1d 100644
   * work correctly. Bail out here if we've found a platform where AF_UNSPEC
   * isn't 0. */
 diff --git a/src/test/test_address.c b/src/test/test_address.c
-index 0d142ad..54170ca 100644
+index 9c88d37..74f2e48 100644
 --- a/src/test/test_address.c
 +++ b/src/test/test_address.c
 @@ -28,6 +28,10 @@
diff --git a/net-vpn/tor/tor-0.3.3.6.recipe b/net-vpn/tor/tor-0.3.3.7.recipe
similarity index 64%
rename from net-vpn/tor/tor-0.3.3.6.recipe
rename to net-vpn/tor/tor-0.3.3.7.recipe
index 2cac3ee9c..41e6fe2a8 100644
--- a/net-vpn/tor/tor-0.3.3.6.recipe
+++ b/net-vpn/tor/tor-0.3.3.7.recipe
@@ -5,43 +5,50 @@ developers to create new communication tools with built-in privacy features. \
 Tor provides the foundation for a range of applications that allow \
 organizations and individuals to share information over public networks \
 without compromising their privacy."
-HOMEPAGE="https://www.torproject.org"
-COPYRIGHT="
-	2001-2004, Roger Dingledine
-	2004-2006, Roger Dingledine, Nick Mathewson
-	2007-2018, The Tor Project, Inc.
-	"
+HOMEPAGE="https://www.torproject.org/"
+COPYRIGHT="2007-2018 The Tor Project, Inc.
+	2004-2006 Nick Mathewson
+	2001-2006 Roger Dingledine"
 LICENSE="Tor"
 REVISION="1"
 SOURCE_URI="https://www.torproject.org/dist/tor-$portVersion.tar.gz"
-CHECKSUM_SHA256="99bc59f6dbf395894de12f3a83b3251a82dfd93dc7f6d3afcbbd80f6111433b7"
+CHECKSUM_SHA256="ea6bb512c4adfbc4e05b22e4c2d06bddff5b358a53de982273fec846b75bde0c"
 PATCHES="tor-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	tor$secondaryArchSuffix = $portVersion
-	cmd:tor$secondaryArchSuffix
-	cmd:tor_gencert$secondaryArchSuffix
-	cmd:tor_resolve$secondaryArchSuffix
-	cmd:torify$secondaryArchSuffix
+	cmd:tor$commandSuffix
+	cmd:tor_gencert$commandSuffix
+	cmd:tor_resolve$commandSuffix
+	cmd:torify$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libevent_2.1$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
+	lib:libevent_2.1$secondaryArchSuffix
 	lib:liblzma$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	lib:libzstd$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libevent_2.1$secondaryArchSuffix
+	devel:liblzma$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:liblzma$secondaryArchSuffix
 	devel:libzstd$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -62,14 +69,23 @@ GLOBAL_WRITABLE_FILES="
 	settings/tor/torrc.sample auto-merge
 	"
 
+defineDebugInfoPackage tor$secondaryArchSuffix \
+	"$commandBinDir"/tor \
+	"$commandBinDir"/tor-gencert \
+	"$commandBinDir"/tor-resolve
+
 BUILD()
 {
-	export CFLAGS="-D_BSD_SOURCE"
-	export CXXFLAGS="-D_BSD_SOURCE"
+	export CPPFLAGS="-D_BSD_SOURCE"
 	export LDFLAGS="-lbsd"
+
 	autoreconf -vfi
-	runConfigure ./configure --disable-gcc-hardening --disable-unittests
-	make
+
+	runConfigure --omit-dirs "binDir sbinDir" ./configure \
+		--bindir="$commandBinDir" --sbindir="$commandBinDir" \
+		--disable-gcc-hardening \
+
+	make $jobArgs
 }
 
 INSTALL()