diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-11 21:41:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-11 21:41:56 -0400 |
| commit | 974f4d2ceb0c494bc5008749928bd2d49317cf0b (patch) | |
| tree | 22b680294ca5f0fec05f46f28597f1e0b87a440a /doc/HACKING | |
| parent | 383238b2f6d30120f1f5c9f99327c3194dbd0654 (diff) | |
| parent | 550c03336ccc256dd9221d2cf9fdc5cef1f87908 (diff) | |
| download | tor-974f4d2ceb0c494bc5008749928bd2d49317cf0b.tar.gz tor-974f4d2ceb0c494bc5008749928bd2d49317cf0b.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
(Do an "ours" merge to avoid taking version number changes)
Diffstat (limited to 'doc/HACKING')
0 files changed, 0 insertions, 0 deletions