diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-07 16:39:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-07 16:39:15 -0500 |
| commit | 0d6ee26af9aa75777fccd81b00a853bc72f8bf76 (patch) | |
| tree | 02c49e2651b323ffd27c28816c3cc5498418daff /doc | |
| parent | e0311f6a36f12c1883bf17c6f891e275598258bc (diff) | |
| parent | 3dfecffa7d6a3ab268983b9477cf36a01e7353f6 (diff) | |
| download | tor-0d6ee26af9aa75777fccd81b00a853bc72f8bf76.tar.gz tor-0d6ee26af9aa75777fccd81b00a853bc72f8bf76.zip | |
Merge branch 'maint-0.2.9'
This is an "ours" merge to avoid taking the version bump.
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions