Merge remote-tracking branch 'tor-github/pr/678'