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

[nickm at torproject.org]

commit 5d3f484f4ac4f45c0404b1f8b998983636f2a693
Merge: 72b132e 784b29a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 21 13:54:07 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22356   | 5 +++++
 src/or/cpuworker.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)