| commit | 3b6f924e507d15fc7290649738048db9c79ec70d | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Mon, 17 Oct 2016 18:57:44 +0000 (17 14:57 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Mon, 17 Oct 2016 18:57:44 +0000 (17 14:57 -0400) | ||
| tree | 48abf7e58221b17a422f5ca316830ca19cd89523 | treesnapshot (tar.gz zip) |
| parent | 52b2b2c82f304629eb1128ed46fdd6edeba7eb67 | commitdiff |
| parent | 0fa3811c787ed4d80f395bbf464271d3cbb2852e | commitdiff |
Merge branch 'maint-0.2.8'
("ours" merge to avoid taking version bump)
("ours" merge to avoid taking version bump)