nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/maint-0.2.1'

Browse Source 
Conflicts:
	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/or/config.c
	src/win32/orconfig.h
This commit is contained in:
Nick Mathewson 2009-10-15 12:33:22 -04:00
commit 5ef97ddd42
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -264,7 +264,7 @@ Changes in version 0.2.2.1-alpha - 2009-08-26
occurred with the upgrade to Vidalia 0.2.3. occurred with the upgrade to Vidalia 0.2.3.
Changes in version 0.2.1.20 - 2009-??-?? Changes in version 0.2.1.20 - 2009-10-15
o Major bugfixes: o Major bugfixes:
- Send circuit or stream sendme cells when our window has decreased - Send circuit or stream sendme cells when our window has decreased
by 100 cells, not when it has decreased by 101 cells. Bug uncovered by 100 cells, not when it has decreased by 101 cells. Bug uncovered
@ -275,10 +275,19 @@ Changes in version 0.2.1.20 - 2009-??-??
- Fix a remotely triggerable memory leak when a consensus document - Fix a remotely triggerable memory leak when a consensus document
contains more than one signature from the same voter. Bugfix on contains more than one signature from the same voter. Bugfix on
0.2.0.3-alpha. 0.2.0.3-alpha.
- Avoid segfault in rare cases when finishing an introduction circuit
as a client and finding out that we don't have an introduction key
for it. Fixes bug 1073. Reported by Aaron Swartz.
o Major features:
- Tor now reads the "circwindow" parameter out of the consensus,
and uses that value for its circuit package window rather than the
default of 1000 cells. Begins the implementation of proposal 168.
o New directory authorities: o New directory authorities:
- Set up urras (run by Jacob Appelbaum) as the seventh v3 directory - Set up urras (run by Jacob Appelbaum) as the seventh v3 directory
authority. authority.
- Move moria1 and tonga to alternate IP addresses.
o Minor bugfixes: o Minor bugfixes:
- Fix a signed/unsigned compile warning in 0.2.1.19. - Fix a signed/unsigned compile warning in 0.2.1.19.
@ -306,9 +315,6 @@ Changes in version 0.2.1.20 - 2009-??-??
excluded in ExcludeExitNodes, but the circuit is not used to access excluded in ExcludeExitNodes, but the circuit is not used to access
the outside world. This should help fix bug 1090. Bugfix on the outside world. This should help fix bug 1090. Bugfix on
0.2.1.6-alpha. 0.2.1.6-alpha.
- Avoid segfault in rare cases when finishing an introduction circuit
as a client and finding out that we don't have an introduction key
for it. Fixes bug 1073. Reported by Aaron Swartz.
- Work around a small memory leak in some versions of OpenSSL that - Work around a small memory leak in some versions of OpenSSL that
stopped the memory used by the hostname TLS extension from being stopped the memory used by the hostname TLS extension from being
freed. freed.

2
src/or/config.c
View File

@ -921,7 +921,7 @@ add_default_trusted_dir_authorities(authority_type_t type)
"tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " "tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
"dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "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 " "Tonga orport=443 bridge no-v2 82.94.251.203:80 "
"4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
"ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "

2
src/win32/orconfig.h
View File

@ -228,3 +228,5 @@
/* Version number of package */ /* Version number of package */
#define VERSION "0.2.2.5-alpha-dev" #define VERSION "0.2.2.5-alpha-dev"