Merge pull request #1750 from ccpp/master

Support for HTTP-Proxy

diff --cc client/common/cmdline.c
Simple merge

diff --cc libfreerdp/common/settings.c
Simple merge

diff --cc libfreerdp/core/gateway/rdg.c
index 8bb0d62,bf37982..65e0bc2
--- 1/libfreerdp/core/gateway/rdg.c
--- 2/libfreerdp/core/gateway/rdg.c
+++ b/libfreerdp/core/gateway/rdg.c
@@@ -34,8 -34,8 +34,9 @@@
  #include <freerdp/utils/ringbuffer.h>
  
  #include "rdg.h"
+ #include "../proxy.h"
  #include "../rdp.h"
 +#include "../../crypto/opensslcompat.h"
  
  #define TAG FREERDP_TAG("core.gateway.rdg")
  

diff --cc libfreerdp/core/gateway/rpc.c
Simple merge