Merge branch 'release/2.0.15' into develop
Fix potential null deref with method logging.
Set method str to '-' if method is unknown.
Merge branch 'develop' of github.com:ellzey/RProxy into develop

Conflicts:
	src/logger.c
Ability to turn off nagle on client/listener/downstream sockets.
Bugfix for methstr assignment.
Merge branch 'feature/disable_nagle' into develop

Conflicts:
	src/logger.c
v2.0.16, see ChangeLog for details
Merge branch 'release/2.0.16'