| commit | c0411e1c892842f9de1c21ca2a5ede58c7b9649d | |
| author | Roger Dingledine <arma@torproject.org> | |
| Thu, 24 Jul 2014 20:31:09 +0000 (24 16:31 -0400) | ||
| committer | Roger Dingledine <arma@torproject.org> | |
| Thu, 24 Jul 2014 20:31:09 +0000 (24 16:31 -0400) | ||
| tree | 0627f2c78f41dbe8cbe4f0eba52ac02c52cea320 | treesnapshot (tar.gz zip) |
| parent | d14fcdc5e857345620866b52ae6e042b3f4585f3 | commitdiff |
| parent | a57c07b21098da4a97d586ffdedca71babe4daaa | commitdiff |
Merge branch 'maint-0.2.5' into release-0.2.5