On Mon, Feb 08, 2016 at 03:33:07PM +0100, Jason A. Donenfeld wrote: > Merged, thanks. Did you mean to merge this to master as well as jd/zx2c4-deployment? (I just want to make sure it doesn't get lost in a future rebase, not a problem if this was intentional to test it before applying to master.)