From b0c0c5f56b37fe7d9f26df74cbb2f1f27d1ab458 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 21 Jul 2019 21:57:35 +0200
Subject: [PATCH 1/2] release 0.34.0-beta

---
 package.json          | 2 +-
 src/services/build.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 410aa40f8..47deb2a8f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.33.7",
+  "version": "0.34.0-beta",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
diff --git a/src/services/build.js b/src/services/build.js
index 4b835331b..14f67b874 100644
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2019-07-11T20:55:56+02:00", buildRevision: "a76dcb44ae1c1cef58b9a66041b183893745a944" };
+module.exports = { buildDate:"2019-07-21T21:57:35+02:00", buildRevision: "6d5f8e056263dbaaf3abf2d532a4fd1059745b58" };

From ea0835561cb32e57803b5a3b3de0a200a4d4c812 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 22 Jul 2019 22:46:06 +0200
Subject: [PATCH 2/2] option to use node's http client for sync without proxy

---
 package-lock.json       | 2 +-
 src/services/request.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index b18de15c6..c0c9210b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.33.7",
+  "version": "0.34.0-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/services/request.js b/src/services/request.js
index 20633820d..69d8c1f0a 100644
--- a/src/services/request.js
+++ b/src/services/request.js
@@ -98,6 +98,11 @@ function getClient(opts) {
         return require('electron').net;
     }
     else {
+        // hack for cases where electron.net does not work but we don't want to set proxy
+        if (opts.proxy === 'noproxy') {
+            opts.proxy = null;
+        }
+
         // in case there's explicit proxy then we need to use protocol of the proxy since we're actually
         // connecting to the proxy server and not to the end-target server
         const {protocol} = url.parse(opts.proxy || opts.url);