[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit baf53300d731c1e047dca217b69bfa372f310d57
Merge: 15ed1c0c8 af3079a49
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 27 20:33:01 2017 -0400

    Merge branch 'maint-0.3.1'

 src/common/workqueue.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)