Merge branch 'master' into ci-add-gitlab

* master:
  Update src/ffi.rs
  s/EcdhHashFunction/EcdhHashFn
  revert unrelated change
  refactor ecdh_raw
  fix ecdh ffi
  fix rand tests
  remove schnorr support