commit 64825357d30509d0a0eca2e7ef6050d179f77c99 Merge: 31f17cb 7c25b41 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 5 13:52:09 2016 -0400 Merge branch 'maint-0.2.7' into release-0.2.7 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)