bug: Several important patches were lost. Reapplying#50

jrconlin merged 1 commit intomasterweb-push-libs/vapid:masterfrom

bug/49aweb-push-libs/vapid:bug/49aCopy head branch name to clipboard