Merge branch 'bug28348_034' into bug28348_035
commit9431d3507490cc85a32969f7eb81808b08966677
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Nov 2018 12:42:55 +0000 (6 07:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Nov 2018 12:42:55 +0000 (6 07:42 -0500)
tree686786d56e453f5ccd5baa5f18a02ba4e09ad52e
parent996f24fcd31be197b8cfc9cb5dddd2b04a4cf3a2
parent2aff02eb3dee506424874bd6d9c1ded3860abc22
Merge branch 'bug28348_034' into bug28348_035
src/core/mainloop/mainloop.c