[tor-commits] [tor/master] Make a cast less const-violating; make a field size explicit.