| commit | 2ebe1fcd52778ea2d305331f4283366eb35c9d93 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 17 Sep 2019 22:57:49 +0000 (17 18:57 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 17 Sep 2019 22:57:49 +0000 (17 18:57 -0400) | ||
| tree | 452a8a39dba1beda29c5511db22321d5c252edaa | treesnapshot (tar.gz zip) |
| parent | 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 | commitdiff |
| parent | 484710f25be73d18fefa1e03339c9247e8ec7337 | commitdiff |
Merge branch 'maint-0.2.9' into maint-0.3.5
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.