Merge remote-tracking branch 'tor-github/pr/1634'

Browse Source

"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.

...

This commit is contained in:

teor

2020-01-15 22:31:10 +10:00

parent b7cfca1dee 54eec5342d

commit d430b5a074

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available