[DONTMERGE] test merge of unmerged libsecp256k1 patches

Just to see how they interact with different platforms in Travis.