Merge branch 'irc_proxy' into development
authorDarren <darren@darrenwhitlen.com>
Fri, 24 Jan 2014 12:46:53 +0000 (12:46 +0000)
committerDarren <darren@darrenwhitlen.com>
Fri, 24 Jan 2014 12:46:53 +0000 (12:46 +0000)
commit794007358d0d715b54c13108fc529cc1f3ac3914
tree7ee4812af9e701cc07f334cd2d2f94d607d676f6
parentbe290112b93798d113d77ad2d676f9958d7239ea
parent5bba09805339718f5f1ea7df8e2816d2df51a70e
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