master
Use err_local.h rather than err.h in most places
Merge ecdsa.h into ec.h
Stop including ecdsa.h and ecdh.h internally