Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
commit2ed194c9a93c9e60ca4d4ff0bbf25acb2cf2c62c
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 18:46:10 +0000 (22 14:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 18:46:10 +0000 (22 14:46 -0400)
tree7bbdddd3da1f7d5fd6c5c879367265ba574cff87
parentedc3f70635fdead8f4dd777117c82b7319c19fe6
parenta7ccd9a997bc85c0e03926b7d24f7e05a4a51d39
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
src/core/mainloop/mainloop.c