commit 93f3f4ae7ad37ad634c6b210753f940d257942a6 Merge: c6fa55d 6352dde Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 1 15:53:54 2016 -0500

Merge branch 'maint-0.2.7'

changes/bug17906 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)