From: Darren <darren@darrenwhitlen.com>
Date: Fri, 24 Jan 2014 12:46:53 +0000 (+0000)
Subject: Merge branch 'irc_proxy' into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=794007358d0d715b54c13108fc529cc1f3ac3914;p=KiwiIRC.git

Merge branch 'irc_proxy' into development

* irc_proxy:
  proxy binding to local interfaces
  ignore invalid cert options
  Identd + SSL fixes
  TLS connection fixes
  Connecting to a SSL/TLS kiwi proxy
  SSL support on the proxy
  Proxy server type in config file
  Proxy connect options
  proxy - correct identd lookup usage
  Identd in Proxy
  proxy.js tidy-up
  Working proxy sockets
---

794007358d0d715b54c13108fc529cc1f3ac3914