[tor-commits] [tor/master] fix compilation; mark test fns static