diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-01 11:45:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-01 11:45:38 -0400 |
| commit | 9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2 (patch) | |
| tree | fc2bfa75ff03259f9c9f1bb3a049a4600c475226 /doc | |
| parent | 01e2aae12a81a0f6023455de47ebc52206ce3263 (diff) | |
| parent | 14bc6e8993c694702f5ab637c36b962f396660a5 (diff) | |
| download | tor-9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2.tar tor-9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
(this is an "ours" merge, to avoid taking 6a4f5d9b4d into 0.2.5: that
commit downgrades the bug 7164 warning in versions <= 0.2.4 because it
isn't as useful as the one 0.2.5 has)
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions