[tor-commits] [gettor/master] Add patches that Andrew came up with in context of #4342: