commit 4f4d77c435d74bdb6359e86ff60c4a4c0d7e45b8 Merge: 8f44d28 7c25b41 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 5 13:52:18 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)