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

[nickm at torproject.org]

commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946
Merge: a29e9a901 05d62a3b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 20:03:46 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2