Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 · 1f18b5a5d5 - CrySP Git Service

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

Nick Mathewson 13 years ago

parent

c319949550 f43aceb0f1

commit

1f18b5a5d5

1 changed files with 2 additions and 1 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 1
						
changes/bug2574
							 
								View File
							
				@@ -1,2 +1,3 @@
			
				   o Minor features:
			
				-    - Allow nameserves with IPv6 address. Fixes bug 2574.
			
				+    - Allow nameservers with IPv6 address. Fixes bug 2574.
			
				+