| commit | 39c056e207f6a0c624139bb7bdd8ad7e2810374c | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Mon, 6 Apr 2015 14:00:45 +0000 (6 10:00 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Mon, 6 Apr 2015 14:00:45 +0000 (6 10:00 -0400) | ||
| tree | ca067c6084f8703b05b72f8810aedbf92642a74d | treesnapshot (tar.gz zip) |
| parent | c4e63b6705ce98a857eb341b79790b1440085fde | commitdiff |
| parent | eb41214dbaf090ba9d556d2d501d2d486e2f8581 | commitdiff |
Merge branch 'maint-0.2.6' into release-0.2.6