[tor-commits] [tor/release-0.3.5] Extract expressions in construct_ntor_key_map()