Merge remote branch 'origin/maint-0.2.1'

Conflicts:
	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h
This commit is contained in:
Nick Mathewson
2010-01-16 16:29:54 -05:00
3 changed files with 38 additions and 8 deletions
-2
View File
@@ -228,5 +228,3 @@
/* Version number of package */
#define VERSION "0.2.2.6-alpha-dev"