| commit | d1c6b2cf11a48db9a79a619547fdc6454b1ce271 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Sun, 19 Oct 2014 18:36:10 +0000 (19 14:36 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Sun, 19 Oct 2014 18:36:10 +0000 (19 14:36 -0400) | ||
| tree | 72cf2d0b4454cb02db30ec1c427099ab1d0b78de | treesnapshot (tar.gz zip) |
| parent | f48def202c897758e3f1c65ae0773d71e5094158 | commitdiff |
| parent | 943fd4a252ad252d7d594622d5988634ddf8f1fc | commitdiff |
Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4