Merge from trunk

diff --cc src/Makefile.am
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side.h
Simple merge

diff --cc src/client_side_request.cc
Simple merge

diff --cc src/tunnel.cc
Simple merge