[tor-commits] [tor/master] Merge branches 'bug27684' and 'bug27685'