Merge branch 'i-like-cheese'

i-like-cheese has seen production use, as has master. The two branches
have diverged a bit. Merge them while they can still be merged without
inducing major headaches.

(There are no conflicts, but some fixes were duplicated.)

diff --cc libratbox/src/openssl.c
Simple merge