commit 53947389a77d6d7a01a7c79624390b9bd6c42d6b Merge: 8c2cad5 19078b1 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 5 13:51:40 2016 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)