| commit | f4992beb566401241cf1dd1d464f4aaade4751f7 | |
| author | Roger Dingledine <arma@torproject.org> | |
| Mon, 28 Jul 2014 06:48:11 +0000 (28 02:48 -0400) | ||
| committer | Roger Dingledine <arma@torproject.org> | |
| Mon, 28 Jul 2014 06:48:11 +0000 (28 02:48 -0400) | ||
| tree | 36f0e71501581d43e4b580dd606c029d53d46660 | treesnapshot (tar.gz zip) |
| parent | 2be259fabf0849c5ef16261bf98321021318e88f | commitdiff |
| parent | 29a82b5a8b6d5e75a1f8b880933c2a232458d386 | commitdiff |
Merge branch 'maint-0.2.5' into release-0.2.5