commit 85c39b647dbd4483da469b029f2273b8d2ae11bd Merge: 5a047cd 4f4d77c Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 5 13:53:28 2016 -0400

Merge branch 'maint-0.2.8'

changes/19271 | 2 ++ 1 file changed, 2 insertions(+)