Integrate selfrando into tor-browser-build.git

We should integrate the changes from legacy/trac#20683 (moved) into the rbm based build.