Commit Graph

213 Commits

Author SHA1 Message Date
JeremyRand
a7d88a5fc8
Merge #18: Shrink diff against upstream Tor as much as possible
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.
2019-06-08 04:14:05 +00:00
JeremyRand
c964910b6e
ncdns: Fix linux/386 builds 2019-04-30 16:46:14 +00:00
JeremyRand
ce2790aa4b
Use Tor's binutils/gcc (not Wheezy's) for Go projects that use cgo
This should improve reproducibility.
2019-04-30 14:25:29 +00:00
JeremyRand
099323061e
Bring rbm.conf closer to upstream 2019-04-30 06:44:48 +00:00
JeremyRand
8b8029df41
Bring Makefile closer to upstream 2019-04-30 06:44:44 +00:00
JeremyRand
9596bbab53
Add tools/clean-old symlink 2019-04-30 05:20:51 +00:00
JeremyRand
385ff1226b
Bring .gitignore closer to upstream 2019-04-30 05:06:17 +00:00
JeremyRand
d6add12b37
Add symlink from rbm to tor-browser-build/rbm
This replaces the rbm submodule that was deleted in the previous commit.
2019-04-30 05:03:24 +00:00
JeremyRand
838080b936
Remove our rbm submodule
Next commit will replace it with a symlink to tor-browser-build's
subdirectory
2019-04-30 05:02:42 +00:00
JeremyRand
fdf931ea31
Pull latest tor-browser-build 2019-04-30 04:59:03 +00:00
JeremyRand
3da6339e69
Pull latest rbm 2019-04-30 04:55:12 +00:00
Hugo Landau
81e88ccff1
Switch to using tor-browser-build submodule 2019-04-05 00:14:11 +01:00
Hugo Landau
d1159b3ee0
Initial commit 2019-01-11 20:34:05 +00:00