diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
| commit | 41eef6680e814f453cc8eedff415e941429aa627 (patch) | |
| tree | 7d2ac796e36d7c5786289a6093a98c66c36dbaad /doc/translations.txt | |
| parent | c6ea014b5978a020ca4472345216ba29584db5a9 (diff) | |
| parent | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (diff) | |
| download | tor-41eef6680e814f453cc8eedff415e941429aa627.tar.gz tor-41eef6680e814f453cc8eedff415e941429aa627.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/dirserv.c
src/or/networkstatus.c
Conflicts were related to routerinfo->node shift.
Diffstat (limited to 'doc/translations.txt')
0 files changed, 0 insertions, 0 deletions