| commit | b969ee9dad0c582bf470c189beba458293f342a8 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Fri, 29 Aug 2014 20:45:10 +0000 (29 16:45 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Fri, 29 Aug 2014 20:45:10 +0000 (29 16:45 -0400) | ||
| tree | 4ba8aa621d4977e147637ea240458a58bad6c22a | treesnapshot (tar.gz zip) |
| parent | ef89fd142cda9881728410710e5b75c30c1dcbb9 | commitdiff |
| parent | 41058dce95b4e94c10b156728524d24d69620ed0 | commitdiff |
Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5