Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	configure.in
This commit is contained in:
Nick Mathewson 2011-02-22 17:55:17 -05:00
commit c2f111a631

View file

@ -1165,7 +1165,6 @@ AC_CONFIG_FILES([
contrib/torctl
contrib/torify
doc/Makefile
doc/spec/Makefile
src/Makefile
src/common/Makefile
src/config/Makefile