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

[nickm at torproject.org]

commit 987e12a58f6ce9e0001413e665ac2aa92869af77
Merge: eacaff6cc 9fcb3ef78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:46:45 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2