[tor-commits] [tor/master] forward-port trove-2017-001 entry and blurb.