* master: (28 commits)
  move macro from functions into macros where it belongs
  convert all functions without args from () to (void)
  update style guide docs to reflect change to (void)
  re-add some removed generators to simplify patch
  Add myself to AUTHORS
  change typeerror to valueerror
  expand the explanation for this workaround and switch XXX to TODO
  A handful of style fixes in the cffi bindings
  Use uintptr_t to get sufficiently wide storage for these types even on 32 bit Windows.
  Shorten long lines
  remove parameter names, fix some spacing
  Remove verify from Hash.
  Documentation clarity and grammer fixes.
  Update documentation on interface as well.
  refactor all tests to use mark instead of generator skips
  rename the method to be less horribly named
  add mark that allows us to do skip tests on backends via decorators
  remove SSL_OP_MSIE_SSLV2_RSA_PADDING
  fix a style error
  fix last warning (macro returns ASN1_ITEM_EXP *)
  ...

Conflicts:
	pytest.ini
	tests/conftest.py

* master: (41 commits)
  Correct spelling, fix phrasing, line wrap.
  Revert "Travis now has an up to date pypy"
  Make capitalization in the glossary consistent and sort it
  Make lib and ffi be private on backend
  Split OpenSSL binding
  Fixed test for earlier exceptino
  Rearrange
  Move GCM tag size/value validation farther forward -- this makes it easier by not requiring future backends to implement the same checks
  expose num_locks and {get,set}_{id,locking}_callback
  Make the PyPy tox job consistent with the main one.
  THis should be a seperate PR
  Typo fix
  This page has been subsumed by the index
  Bump the copyright year
  Document compiling OpenSSL to avoid conflicts
  missed some param names (C style fix)
  add the rest of the engine methods
  fix bogus merge
  Switch to long for these stand-in constants as suggested by reaperhulk to avoid compiler warnings
  Restore exposing a symbol when it's available. Refs pyca#351
  ...

* master:
  backend support check now lists which backend caused the skip
  add to author list
  Also use an absolute path for the about file
  Include a long description in our setup.py
  Explanatory comment
  So the tests don't all explode
  fixed typo
  flake8
  test for ctr
  Tests for OFB and CFB
  Implement this for CTR
  Validate the IV/nonce length for a given algorithm.

* master:
  improve docstring
  fix indentation mistake
  import build_ffi directly
  remove verify_kwargs and replace with pre_include/post_include/libraries
  refactor bindings to reduce code duplication with multiple backends
  instantiate hash objects for hmac checks too
  Instantiate our hash objects used for supported checks