commit 261f4c3f6f028cf4becff1077c08735e308d7d43
Merge: f3575a4 11386eb
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Jul 29 11:17:49 2016 -0400
Merge branch 'maint-0.2.8'
("Ours" merge, to avoid bumping version in master)