| commit | b2b604ecb4df95526a309c9ff507dff942472daa | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 28 Feb 2017 15:22:36 +0000 (28 10:22 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 28 Feb 2017 15:22:36 +0000 (28 10:22 -0500) | ||
| tree | fa8d40ee823e5c287cdc02cd0755a15f0a9b7131 | treesnapshot (tar.gz zip) |
| parent | aeb299ba6df12aa26327ff6459174f6f9a575b0c | commitdiff |
| parent | 4bab288a822a5312ee2953822563e694c7274afb | commitdiff |
Merge branch 'maint-0.2.4' into maint-0.2.5
"ours" merge to avoid bumping version
"ours" merge to avoid bumping version