| commit | f06d9a9cef036fc4da995f3ffda8e7a7770d0b74 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Fri, 5 Feb 2016 13:13:13 +0000 (5 08:13 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Fri, 5 Feb 2016 13:13:13 +0000 (5 08:13 -0500) | ||
| tree | c686ca5c71471115dfc873d99bdec3ea21fc23a2 | treesnapshot (tar.gz zip) |
| parent | 9ca329581af71c9aa6890b63c29c6a51ac37e408 | commitdiff |
| parent | d5ac79e056bdb740adecf45ef3b50d1c16cf394f | commitdiff |
Merge branch 'maint-0.2.4' into maint-0.2.5