[tor-commits] [sbws/master] Merge branch 'bug28645'