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

[nickm at torproject.org]

commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4
Merge: c3a750486 198b6354e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 11 13:09:21 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2