diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-11-21 18:36:49 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-11-21 18:36:49 -0500 |
| commit | 6a76007b089a2ca31b67b2ce15dd28edeb416428 (patch) | |
| tree | d61bc05bc50b9f4ac8782f321ae6af960c8fa9db /ChangeLog | |
| parent | c9f24edb13faf17dc314be51127736acfc3de17a (diff) | |
| parent | 97a209ea28f1b64fba51157e3e695c676eb0cf8e (diff) | |
| download | tor-6a76007b089a2ca31b67b2ce15dd28edeb416428.tar.gz tor-6a76007b089a2ca31b67b2ce15dd28edeb416428.zip | |
Merge branch 'maint-0.2.2'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions