Merge remote-tracking branch 'origin/maint-0.2.2' · 57ff9913b2 - CrySP Git Service

Explorar o código

Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/connection_or.c

The conflict in src/or/connection_or.c is resolved by taking the
version in master, since e27a26d5 already fixed bug 4531 on master.
This merge just adds the changes file from 0.2.2.

Nick Mathewson %!s(int64=14) %!d(string=hai) anos

pai

d9edee3a3b 6171bdd105

achega

57ff9913b2

Modificáronse 1 ficheiros con 4 adicións e 0 borrados

Dividir vista Mostrar estatísticas de Diff

						
							+ 4
							
							- 0
						
changes/bug4531
							 
								Ver ficheiro
							
				@@ -0,0 +1,4 @@
			
				+  o Major bugfixes:
			
				+    - Fix null-pointer access that could occur if TLS allocation failed.
			
				+      Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un".
			
				+