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