Merge pull request #434 from TheBlueMatt/2019-12-var-len-onion