Removed old function declarations from crypto.h
Merge pull request #79 from Fraser999/MAID-537

Several updates relating Routing v2
Merge remote-tracking branch 'upstream/next' into routing_v2