commit d1c0dbabfaa2d26839af55c834677b667479b369 Merge: 4cca7fb99 dd6c2b0ad Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 23 09:50:38 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

"ours" merge to avoid dropping non-broken changes files after removal of merged 0.2.9 changes files.