diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
index c5834ddd0d03..1ba27b4a0101 100644
--- a/src/chrome/content/code/HTTPS.js
+++ b/src/chrome/content/code/HTTPS.js
@@ -43,8 +43,8 @@ const HTTPS = {
var isSTS = securityService.isSecureURI(
CI.nsISiteSecurityService.HEADER_HSTS, channel.URI, 0);
if (blob === null) {
- // Abort insecure requests if HTTP Nowhere is on
- if (httpNowhereEnabled && channel.URI.schemeIs("http") && !isSTS) {
+ // Abort insecure non-onion requests if HTTP Nowhere is on
+ if (httpNowhereEnabled && channel.URI.schemeIs("http") && !isSTS && !/\.onion$/.test(channel.URI.host)) {
IOUtil.abort(channel);
}
return false; // no rewrite
diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul
index 2736b669a0b3..cd646e984513 100644
--- a/src/chrome/content/toolbar_button.xul
+++ b/src/chrome/content/toolbar_button.xul
@@ -47,7 +47,7 @@
command="https-everywhere-menuitem-resetToDefaults" class="hide-on-disable"/>
-