Use explicit default ciphers and base the list on the current Google configuration, with 2 TLS 1.2 ciphers up front.
Merge pull request #1 from b/improve_default_ciphers

Use explicit default ciphers and base the list on the current Google con...
Merge branch 'release/2.0.11'

Conflicts:
	src/cfg.c
Merge branch 'develop'
during cfg parsing, stat SSL configuration files to ensure that they exist
Merge pull request #1 from sross/develop

during cfg parsing, stat SSL configuration files to ensure that they exist
blerp
Merge branch 'develop' of github.mandiant.com:OpenSource/RProxy into develop
blerp
use htparser_get_content_pending
derp
v2.0.13, see ChangeLog for details.
Merge branch 'master' of github.mandiant.com:OpenSource/RProxy into release/2.0.13
v2.0.13
Merge branch 'release/2.0.13' into develop
Fix bug where connection->request was not being set to NULL on error.