Merge remote-tracking branch 'tor-github/pr/1899/head'