Merge pull request #653 from mattconnolly/master

Fix preprocessor typoe
First attempt at inproc connect before bind
Merge remote-tracking branch 'upstream/master' into inproc_connect_before_bind
Fixed overwrite in zmq_getsockopt

On ZMQ_CURVE_xxxKEY fetches, would return 41 bytes into caller's 40-byte
buffer. Now these fetches only return 41 bytes if the caller explicitly
provides a 41-byte buffer (i.e. the option size is 41).
add exhaustive comparison in testutil bounce
Merge pull request #654 from lalebarde/master

add exhaustive comparison in testutil bounce
Fix race condition and support multiple socket connects before bind.
Merge pull request #655 from hintjens/master

Fixed overwrite in zmq_getsockopt
Send identities when connecting pending sockets.
Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind
Fix whitespace
Merge pull request #656 from ricnewton/inproc_connect_before_bind

Allow inproc sockets to connect before bind
Build didn't work if libsodium wasn't installed
Merge pull request #657 from hintjens/master

Build didn't work if libsodium wasn't installed
Support high water mark on inproc socket connect before bind.
Set hwm on connect socket before bind has happend to just that of connects hwm.
Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind
Merge pull request #658 from ricnewton/inproc_connect_before_bind

Support high water mark on inproc socket connect before bind.
Minor simplification to makefile
Fixed Z85 methods to be static and not pollute library