diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-21 16:10:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-21 16:10:31 -0500 |
| commit | b99a8d54271dfd26c5c3a2d3086226974b32373e (patch) | |
| tree | d3faab523a3f23925c654005f927945b79ce95fc /ChangeLog | |
| parent | 90f9caf4233c3db87f818d10c6c2b93e4fe398c9 (diff) | |
| parent | d673479ebaa29b2dc8f227c342785112c945ec18 (diff) | |
| download | tor-b99a8d54271dfd26c5c3a2d3086226974b32373e.tar.gz tor-b99a8d54271dfd26c5c3a2d3086226974b32373e.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
doc/spec/Makefile.am
doc/spec/control-spec.txt
doc/spec/dir-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/001-process.txt
doc/spec/proposals/ideas/xxx-encrypted-services.txt
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions