Added function header for freerdp_update_gateway_usage_method
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Hardening (4) and others
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: add locks to disable full duplex BIOs (currently unsafe)
  transport: add another null pointer check.
  transport: add a null pointer check.
  rdpsnd/server: fix incorrect use of channe handle.
  tcp: add timeout to prevent buggy client from hanging.
  Check that bpp has reasonable value
  Check for bpp > 0
  Set checks to be strict and also check xorBpp field
  Fixes for CVE-2014-0250
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Don't forget to SetLastError() on disconnection

Otherwise if the last error was a ERROR_NO_DATA we have no indication that
the pipe has been closed.
Added define guards for _rotl and related bit rotation functions, which collided with function definitions in x86intrin.h
Merge pull request #1906 from mrd-cloudbase/master

Added define guards for _rotl and related bit rotation functions
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of https://github.com/mrthebunny/FreeRDP

# Via Benoit LeBlanc
* 'master' of https://github.com/mrthebunny/FreeRDP:
fix smart sizing parsing
Merge pull request #1902 from hardening/pipeFix

Don't forget to SetLastError() on disconnection
libwinpr-sspi: add support for passing NTLMv2 hash
Silently handle EINTR and retry operation
Merge branch 'master' of github.com:FreeRDP/FreeRDP
Merge pull request #1913 from awakecoding/master

NTLM SSPI Module Improvements
Implement a confirm block callback

This patch adds a callback called when we receive feedback from the
client.
Also specify the timestamp when sending samples

This patch complements the SendSample() callback to take the timestamp
as extra argument.
Merge pull request #1914 from hardening/pipe_eintr

Silently handle EINTR and retry operation