Wladimir J. van der Laan ebd7d8d78c
Parameter interaction: disable upnp if -proxy set
To protect privacy, do not use UPNP when a proxy is set. The user may
still specify -listen=1 to listen locally (for a hidden service), so
don't rely on this happening through -listen.

Fixes #2927.

Conflicts:
	src/init.cpp

Rebased-From: 8c35b6f3be218101630101806300cfd75be23f58
Github-Pull: #6153
2015-05-27 09:35:40 +02:00
..
2015-03-19 00:14:28 -04:00
2014-11-20 17:22:06 +01:00
2015-02-01 17:57:38 -04:00
2015-05-12 16:33:04 +02:00
2015-02-03 10:33:58 +01:00
2015-05-27 09:11:27 +02:00
2014-11-03 16:16:40 +01:00
2015-04-01 16:39:55 +02:00
2014-11-03 16:16:40 +01:00
2014-12-03 10:52:58 +00:00
2014-12-03 10:52:58 +00:00
2014-11-03 16:16:40 +01:00
2014-12-03 10:52:58 +00:00
2015-03-19 00:14:28 -04:00
2014-12-03 10:52:58 +00:00
2014-12-05 11:24:39 +01:00
2014-11-20 17:22:02 +01:00
2014-11-20 17:22:02 +01:00
2014-12-01 14:57:58 +01:00
2014-12-01 14:57:58 +01:00
2015-03-09 11:13:35 +01:00
2015-05-27 09:10:56 +02:00
2014-08-28 22:25:21 +02:00
2014-12-03 10:52:58 +00:00
2015-03-19 00:14:28 -04:00
2014-11-03 16:16:40 +01:00
2014-11-20 17:22:02 +01:00
2014-11-25 08:18:33 +01:00
2015-04-14 10:52:03 +02:00
2014-12-03 10:52:58 +00:00
2014-11-03 16:16:40 +01:00
2014-10-03 04:29:51 +02:00