Merge branch 'maint-0.2.6' into maint-0.2.7

"ours" merge to avoid reverting 17354, which was already fixed in
0.2.7.4-rc.
This commit is contained in:
Nick Mathewson 2017-02-07 09:29:27 -05:00
commit 86d5a6fac0

Diff Content Not Available