Merge branch 'master' of https://github.com/zeromq/libzmq
socks: fix build on FreeBSD

The fix should be sane on all UNIX-like systems, so there's
no ZMQ_HAVE_FREEBSD involved.  It's likely that other BSDs
stumble across this problem too.
Merge pull request #1113 from fichtner/socks_include

socks: fix build on FreeBSD
Add missing socks files
Merge pull request #1114 from PalmStoneGames/master

Add missing socks files
Code cleanup
Merge pull request #1112 from hintjens/master

Problem: two header files for a single library
Merge pull request #1115 from hurtonm/master

Code cleanup
Thread scheduling parameters: Use ZMQ context options instead of
environment variables.
Merge pull request #1117 from jlauenercern/master

Thread scheduling parameters: Use ZMQ context options instead of environment variables.
Add static compilation on CMake
Merge pull request #1118 from guidefloripa/master

Add static compilation on CMake
Fix to build on OpenBSD
Merge remote-tracking branch 'upstream/master'
duplicated type definitions when using CMAKE
Merge pull request #1119 from mosconi/master

Fix to build on OpenBSD
Don't delay reception of signal

- new code may help undersdtand issue #1108
  (https://github.com/zeromq/libzmq/issues/1108)
- code cleanups
Merge pull request #1120 from hurtonm/master

Don't delay reception of signal
vs2012: Add missing socks files
Merge pull request #1121 from twhittock/master

vs2012: Add missing socks files