Merging from upstream and resolve conflicts

resolving merge conflicts with src/ec_send.c for pr #288

correct TTL values left by the conflicting merge