0993230 Bring rbm.conf closer to upstream (JeremyRand)
8b8029d Bring Makefile closer to upstream (JeremyRand)
9596bba Add tools/clean-old symlink (JeremyRand)
385ff12 Bring .gitignore closer to upstream (JeremyRand)
d6add12 Add symlink from rbm to tor-browser-build/rbm (JeremyRand)
838080b Remove our rbm submodule (JeremyRand)
fdf931e Pull latest tor-browser-build (JeremyRand)
3da6339 Pull latest rbm (JeremyRand)
Pull request description:
This PR eliminates most of the diff between ncdns-repro and upstream tor-browser-build. It wasn't feasible to properly audit most of the diff, and upstream has substantially better QA resources than we do. If any parts of the diff were actually required for ncdns, I suggest either submitting them as follow-up PR's here (with comments explaining why they're needed), or else submitting them upstream to Tor.
I can confirm that `make release-linux-x86_64` produces a working binary (modulo cgo issues that I'll file separately) with this PR applied. I haven't tried any of the other targets.