| commit | dc3890439f156d4c79b153f13f7ecf3393362b29 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Fri, 1 Dec 2017 14:34:47 +0000 (1 09:34 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Fri, 1 Dec 2017 14:34:47 +0000 (1 09:34 -0500) | ||
| tree | 4f26fb5d9d497503849f2e79df9f0db7b524fb51 | treesnapshot (tar.gz zip) |
| parent | 8f858de8193cc66c9b19627ad5c07261639bd7df | commitdiff |
| parent | 162a087e5feb1205e3cefb7b1ab12ad0c0d2e041 | commitdiff |
Merge branch 'maint-0.2.5' into maint-0.2.8
"ours" merge to avoid version bump.
"ours" merge to avoid version bump.