diff options
| author | teor <teor@torproject.org> | 2020-01-15 22:31:10 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-01-15 22:31:10 +1000 |
| commit | d430b5a0749b4f1256b64e6d36ea684e9ba1cae8 (patch) | |
| tree | 3a4e34f0d53e891aee652f62be7bf7d4a558e075 | |
| parent | b7cfca1dee4d4435f87c2e7b7233f51a956c56ee (diff) | |
| parent | 54eec5342d45e9add5b9a8fee0167267c38f63f9 (diff) | |
| download | tor-d430b5a0749b4f1256b64e6d36ea684e9ba1cae8.tar.gz tor-d430b5a0749b4f1256b64e6d36ea684e9ba1cae8.zip | |
Merge remote-tracking branch 'tor-github/pr/1634'
"Ours" merge, because ticket 32883 replaces this code with calls
to tor_run_main(). (Which then calls the pubsub functions.)
Therefore, this PR is obsolete in master, but it still needs to be
merged, to avoid conflicts during any future backport.
0 files changed, 0 insertions, 0 deletions