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

[nickm at torproject.org]

commit 59a78187cdf9c48f492e92c3a33ce17b75f7472d
Merge: cac495f 24b7b92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 31 15:20:45 2016 -0400

    Merge branch 'maint-0.2.9'

 changes/bug20401   | 4 ++++
 src/or/cpuworker.c | 1 +
 2 files changed, 5 insertions(+)