Merge branch 'ticket27750_034_01_squashed' into maint-0.3.5
commitd598d834f5ce3ae3decb53336c95c8f5d361587a
authorNick Mathewson <nickm@torproject.org>
Wed, 14 Nov 2018 20:43:46 +0000 (14 15:43 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 14 Nov 2018 20:43:46 +0000 (14 15:43 -0500)
tree04416c710590a492d779d8262598ae6a3fce7a17
parenta58b19465d9ffada3df87ea9be769d1f27c414cc
parentc99f220f7857e40bd9c09bd0c240b3b9aea4d6f8
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.5
src/core/mainloop/mainloop.c