[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit fe3b7e15b52e5882aabc75a0cd1d986c5b872130
Merge: 33b5008 d850d27
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 14:48:30 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8