commit df58a97f406bddf11c667e7aeec4b272a1d1a67e Merge: a2523196a cc4c1840a Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 26 15:38:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

.travis.yml | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ changes/bug22636 | 8 ++++++ 2 files changed, 96 insertions(+)