diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-10-15 12:33:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-10-15 12:33:22 -0400 |
| commit | 5ef97ddd42dfd51fc296bb51b612780aec09c5c7 (patch) | |
| tree | 25ee0fef4a99b3e5d5945592869ab8b4fedf9db3 /src | |
| parent | d407d81a447f7ff7d53ac838703574c89acbc732 (diff) | |
| parent | 16dc543851bb82c481d4319d557ffea5bef6cc50 (diff) | |
| download | tor-5ef97ddd42dfd51fc296bb51b612780aec09c5c7.tar.gz tor-5ef97ddd42dfd51fc296bb51b612780aec09c5c7.zip | |
Merge commit 'origin/maint-0.2.1'
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/or/config.c
src/win32/orconfig.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 84fe80350b..df346081a8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -921,7 +921,7 @@ add_default_trusted_dir_authorities(authority_type_t type) "tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.214:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Tonga orport=443 bridge no-v2 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 0c4c5ccd6b..37a1b10264 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -228,3 +228,5 @@ /* Version number of package */ #define VERSION "0.2.2.5-alpha-dev" + + |