Merge branch 'maint-0.3.1' into maint-0.3.2
commit451c852a0f75fe9ac6935851e763a948c1c5b197
authorNick Mathewson <nickm@torproject.org>
Wed, 3 Jan 2018 14:00:00 +0000 (3 09:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 3 Jan 2018 14:00:00 +0000 (3 09:00 -0500)
tree5150cf06fdd052b3d7146caa65679ffde0e1214c
parent2aa1767b25e6b2b04892696c4c00e0257feb3812
parentc1d98c75e305eaf63e81903ca5a4eb68dcae515b
Merge branch 'maint-0.3.1' into maint-0.3.2
src/ext/timeouts/timeout-bitops.c