Merge pull request #316 from hintjens/master

Fixed issue #312
Merge pull request #317 from hintjens/master

Improved doc/Makefile.am generation (fixed issue in edgenet/drops)
cancel timers by identifier
fixes MacOSX 'can't find libzmq' when installed on /usr/local/lib, by copying a configure block from jzmq ;)
Merge pull request #320 from davipt/master

fixes MacOSX 'can't find libzmq' when installed on /usr/local/lib, by co...
Merge branch 'master' of https://github.com/zeromq/czmq into cancel_timer_by_id
fix selftest, return lcrypto
Merge pull request #318 from claws/cancel_timer_by_id

cancel timers by identifier
Merge pull request #324 from hintjens/master

Fixed #322
Fix #326

`sys/param.h` is already conditionally included in `czmq_prelude.h`.

Signed-off-by: Shannen Saez <shannenlaptop@gmail.com>
Merge pull request #328 from shancat/sha1_windows

Fix #326
Add missing #defines for Android.

`S_IREAD` & `S_IWRITE` are deprecated.

Signed-off-by: Shannen Saez <shannenlaptop@gmail.com>
Merge pull request #327 from shancat/master

Add missing #defines for Android.
Fix Windows build.

Windows will see that `S_IREAD` & `S_IWRITE` aren't defined and try to
access `S_IRUSR` & `S_IWUSR` which don't exist on Windows.

Signed-off-by: Shannen Saez <shannenlaptop@gmail.com>
Merge pull request #329 from shancat/master

Fix Windows build.
Add Diffserv sockopt
Merge pull request #330 from claws/add_diffserv_socket_option

Add Diffserv sockopt
ZMQ_PROBE_ROUTER was defined as read-only

- made read/write so the option can be set
- also updated all man pages