| commit | 06e8f4b370b4ddf096482dafb64ad7f394cbd28a | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Wed, 3 Sep 2014 17:46:31 +0000 (3 13:46 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Wed, 3 Sep 2014 17:46:31 +0000 (3 13:46 -0400) | ||
| tree | 314428e1514300df17fb5a700a7695c568d82972 | treesnapshot (tar.gz zip) |
| parent | 475c95f28a70fff665a4b6a608a4d3a61c2c77d9 | commitdiff |
| parent | dcb4ee5b83b69234ef8fd0fce8533ab1c4434bd9 | commitdiff |
Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5