Merged from trunk

diff --cc src/client_side.cc
Simple merge

diff --cc src/ssl/support.cc
index 8d01d9a5aa6bbeb6d88f0f25916c8e409110f759,b913aed13317ad56da823e90e52417fddcfd7d22..aaaa63a5c99f4ad21980943176340c96fb7cc6d3
--- 1/src/ssl/support.cc
--- 2/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@@ -39,8 -41,10 +39,9 @@@
  #if USE_SSL
  
  #include "acl/FilledChecklist.h"
+ #include "anyp/PortCfg.h"
  #include "fde.h"
  #include "globals.h"
 -#include "protos.h"
  #include "ssl/ErrorDetail.h"
  #include "ssl/support.h"
  #include "ssl/gadgets.h"

diff --cc src/ssl/support.h
Simple merge