diff --git a/net/tor/Makefile b/net/tor/Makefile
index 02c352d95ee..8d6c820af70 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2005/01/03 22:03:00 sturm Exp $
+# $OpenBSD: Makefile,v 1.5 2005/01/30 20:20:18 naddy Exp $
 
 COMMENT=	"Anonymity service using onion routing"
 
-DISTNAME=	tor-0.0.9.1
+DISTNAME=	tor-0.0.9.3
 CATEGORIES=	net
 HOMEPAGE=	http://www.freehaven.net/tor/
 
@@ -11,7 +11,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c crypto ssl 
+WANTLIB=		c crypto ssl z
 
 MASTER_SITES=	http://www.freehaven.net/tor/dist/
 
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 852f19029e7..559eb026fcf 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,4 +1,4 @@
-MD5 (tor-0.0.9.1.tar.gz) = a79e653bcb99a19baf7221405ebf0faa
-RMD160 (tor-0.0.9.1.tar.gz) = 9e55c21e470ab72184922e2c5560aed10f7050e2
-SHA1 (tor-0.0.9.1.tar.gz) = 3bfc2507640886e62565720e5252ca7fa422a95e
-SIZE (tor-0.0.9.1.tar.gz) = 518594
+MD5 (tor-0.0.9.3.tar.gz) = c5e482ef2c36fe87a578ae35fa3b66fd
+RMD160 (tor-0.0.9.3.tar.gz) = c66017f32c489f267d6347bb7da92a739652b21f
+SHA1 (tor-0.0.9.3.tar.gz) = 2aa29ba40bbaffb209588f636cf0650f8fbb58fa
+SIZE (tor-0.0.9.3.tar.gz) = 541810
diff --git a/net/tor/patches/patch-configure b/net/tor/patches/patch-configure
index fe02a35c76c..c4118f1b1f4 100644
--- a/net/tor/patches/patch-configure
+++ b/net/tor/patches/patch-configure
@@ -1,28 +1,12 @@
---- configure.orig	Wed Dec 15 20:45:59 2004
-+++ configure	Mon Jan  3 20:57:38 2005
-@@ -2270,13 +2270,13 @@ if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+    CFLAGS=""
-   else
--    CFLAGS="-g"
-+    CFLAGS=""
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+    CFLAGS=""
-   else
-     CFLAGS=
-   fi
+$OpenBSD: patch-configure,v 1.2 2005/01/30 20:20:18 naddy Exp $
+--- configure.orig	Sun Jan 30 21:05:20 2005
++++ configure	Sun Jan 30 21:06:03 2005
 @@ -10713,7 +10713,7 @@ LOCALSTATEDIR=`eval echo $localstatedir`
  
  # Set CFLAGS _after_ all the above checks, since our warnings are stricter
  # than autoconf's macros like.
 -CFLAGS="$CFLAGS -Wall -g -O2"
-+CFLAGS="$CFLAGS -Wall"
++#CFLAGS="$CFLAGS -Wall -g -O2"
  # Add some more warnings which we use in the cvs version but not in the
  # released versions.  (Some relevant gcc versions can't handle these.)
  #CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls"
diff --git a/net/tor/patches/patch-src_common_crypto_c b/net/tor/patches/patch-src_common_crypto_c
deleted file mode 100644
index f52a044e100..00000000000
--- a/net/tor/patches/patch-src_common_crypto_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_common_crypto_c,v 1.1 2005/01/03 22:03:01 sturm Exp $
---- src/common/crypto.c.orig	Mon Jan  3 22:42:39 2005
-+++ src/common/crypto.c	Mon Jan  3 22:41:51 2005
-@@ -470,7 +470,8 @@ crypto_pk_write_private_key_to_filename(
-   len = BIO_get_mem_data(bio, &cp);
-   tor_assert(len >= 0);
-   s = tor_malloc(len+1);
--  strlcpy(s, cp, len+1);
-+  memcpy(s, cp, len);
-+  s[len]='\0';
-   r = write_str_to_file(fname, s, 0);
-   BIO_free(bio);
-   free(s);