| commit | 253f8140c862c24762181a6c6dc6bbba97d4e96c | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 2 Aug 2016 15:14:08 +0000 (2 11:14 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 2 Aug 2016 15:14:08 +0000 (2 11:14 -0400) | ||
| tree | 88e0b2e01dfa2a8a7e69712083fc20bbeb4c6e54 | treesnapshot (tar.gz zip) |
| parent | 8c2ee16b8f9ea5a9ed424584c3cb758c4e58883c | commitdiff |
| parent | 6b740aa46b513eaaa0d5b2dba0dce138e988e2a5 | commitdiff |
Merge branch 'maint-0.2.8'
(This is an "ours" merge to avoid taking the version number bump.)
(This is an "ours" merge to avoid taking the version number bump.)