commit aeb95c20919dbff13ee936fea7fda4a63a11f918 Merge: 6220cd1 717eae3 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 5 12:58:18 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug19499 | 2 +- changes/bug19556 | 2 +- changes/bug19557 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)