commit 7c25b41c8cfffebddbc7ba4d66aa345642eebc1f Merge: 6e96aad 92891de Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 5 13:52:04 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)