Merge branch 'bug27849_redux'
commit56a3cef4d73922a687fa4256938b5c459aada42c
authorNick Mathewson <nickm@torproject.org>
Tue, 16 Oct 2018 21:33:58 +0000 (16 17:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 16 Oct 2018 21:33:58 +0000 (16 17:33 -0400)
tree9a632fdc4116b5614347b45566e1d232f9bc4395
parent698629f5a9eca21e0251f5d249f176a00aebf871
parentb5731cdf2ecdf0662de7268d95aa67cfaca92b6e
Merge branch 'bug27849_redux'
src/core/mainloop/mainloop.c