commit 9ec08f98995a87baf6c0367a036661286f58e295 Merge: 1453bda 58908b6 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 10:40:34 2017 -0500

Merge branch 'maint-0.3.0'

This is an "ours" merge to avoid a version bump.