[tor-commits] [tor/master] Merge branch 'bug7087' of git://git.torproject.org/user/andrea/tor