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

changes/zlib_aint_openssl

@@ -0,0 +1,3 @@
+  o Minor bugfixes
+    - When warning about missing zlib development packages, give the
+      correct package names.  Bugfix on 0.2.0.1-alpha.

configure.in

@@ -375,10 +375,10 @@ AC_SUBST(TOR_OPENSSL_LIBS)
 dnl ------------------------------------------------------
 dnl Where do you live, zlib?  And how do we call you?
 
-tor_openssl_pkg_redhat="zlib"
-tor_openssl_pkg_debian="zlib1g"
-tor_openssl_devpkg_redhat="zlib-devel"
-tor_openssl_devpkg_debian="zlib1g-dev"
+tor_zlib_pkg_redhat="zlib"
+tor_zlib_pkg_debian="zlib1g"
+tor_zlib_devpkg_redhat="zlib-devel"
+tor_zlib_devpkg_debian="zlib1g-dev"
 
 TOR_SEARCH_LIBRARY(zlib, $tryzlibdir, [-lz],
     [#include <zlib.h>],