| commit | 095080360f1511d35fc62be8bc7c804fbcccbdc3 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Mon, 20 Oct 2014 01:38:17 +0000 (19 21:38 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Mon, 20 Oct 2014 01:38:17 +0000 (19 21:38 -0400) | ||
| tree | 79b56a5391931a3371dfe18a6de5544db62d890c | treesnapshot (tar.gz zip) |
| parent | 9ffb2d881862571a5c24aefdec151fa1d55b2ca5 | commitdiff |
| parent | fd8f21e730ff2f9f8ace9951bf17fe357a0f8a27 | commitdiff |
Merge branch 'maint-0.2.5' into release-0.2.5