Merge branch 'maint-0.2.8' into maint-0.2.9

(ours merge, to avoid taking 20865 fix)
This commit is contained in:
Nick Mathewson 2016-12-07 18:28:09 -05:00
commit f602172dba

Diff Content Not Available