| commit | 0d6ee26af9aa75777fccd81b00a853bc72f8bf76 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Mon, 7 Nov 2016 21:39:15 +0000 (7 16:39 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Mon, 7 Nov 2016 21:39:15 +0000 (7 16:39 -0500) | ||
| tree | 02c49e2651b323ffd27c28816c3cc5498418daff | treesnapshot (tar.gz zip) |
| parent | e0311f6a36f12c1883bf17c6f891e275598258bc | commitdiff |
| parent | 3dfecffa7d6a3ab268983b9477cf36a01e7353f6 | commitdiff |
Merge branch 'maint-0.2.9'
This is an "ours" merge to avoid taking the version bump.
This is an "ours" merge to avoid taking the version bump.