diff --git a/net/tor/Makefile b/net/tor/Makefile
index 2d564047047..b244698b4ab 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2007/05/02 18:20:44 rui Exp $
+# $OpenBSD: Makefile,v 1.28 2007/05/26 17:09:05 rui Exp $
 
 COMMENT=	"anonymity service using onion routing"
 
-DISTNAME=	tor-0.1.2.13
+DISTNAME=	tor-0.1.2.14
 CATEGORIES=	net
 HOMEPAGE=	http://tor.eff.org/
 
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 0c1e249b6ec..5e0658676ea 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,5 +1,5 @@
-MD5 (tor-0.1.2.13.tar.gz) = 21Sr3d9+tYWbbhvfX37OAA==
-RMD160 (tor-0.1.2.13.tar.gz) = g2TjWhslgP9dAggXV8BVC78T6Ms=
-SHA1 (tor-0.1.2.13.tar.gz) = 2QqZm9zhxKvOFrMSEZGKdV39z2o=
-SHA256 (tor-0.1.2.13.tar.gz) = yKM1IbMuBLAM6XxKuYCkIytAKShM0pRPSWYJqXl7ohs=
-SIZE (tor-0.1.2.13.tar.gz) = 1181719
+MD5 (tor-0.1.2.14.tar.gz) = 3JOlL5wS7H/nOzkFoo8J7A==
+RMD160 (tor-0.1.2.14.tar.gz) = 986YaIUZvS1BvA3ZX7kKEg6uQgc=
+SHA1 (tor-0.1.2.14.tar.gz) = lBQFCb8VjSyrJl5RkwZ/M10qPM4=
+SHA256 (tor-0.1.2.14.tar.gz) = vCPm+Cbx9zbp1eVrp5GVCZiCrvICmmPdZnkVvB64NqY=
+SIZE (tor-0.1.2.14.tar.gz) = 1225040
diff --git a/net/tor/patches/patch-configure b/net/tor/patches/patch-configure
index c9c75950906..fe5d9f4a89a 100644
--- a/net/tor/patches/patch-configure
+++ b/net/tor/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.4 2007/05/02 18:20:44 rui Exp $
---- configure.orig	Tue May  1 14:16:09 2007
-+++ configure	Tue May  1 14:17:02 2007
-@@ -16998,7 +16998,7 @@ _ACEOF
+$OpenBSD: patch-configure,v 1.5 2007/05/26 17:09:05 rui Exp $
+--- configure.orig	Fri May 25 01:52:00 2007
++++ configure	Sat May 26 17:03:09 2007
+@@ -17565,7 +17565,7 @@ _ACEOF
  # Set CFLAGS _after_ all the above checks, since our warnings are stricter
  # than autoconf's macros like.
  if test $ac_cv_c_compiler_gnu = yes; then
diff --git a/net/tor/patches/patch-src_config_torrc_sample_in b/net/tor/patches/patch-src_config_torrc_sample_in
index 07b95d0a1de..9012e92474d 100644
--- a/net/tor/patches/patch-src_config_torrc_sample_in
+++ b/net/tor/patches/patch-src_config_torrc_sample_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_config_torrc_sample_in,v 1.3 2007/05/02 18:20:44 rui Exp $
---- src/config/torrc.sample.in.orig	Tue May  1 14:17:58 2007
-+++ src/config/torrc.sample.in	Tue May  1 14:19:23 2007
+$OpenBSD: patch-src_config_torrc_sample_in,v 1.4 2007/05/26 17:09:05 rui Exp $
+--- src/config/torrc.sample.in.orig	Fri May 25 01:51:41 2007
++++ src/config/torrc.sample.in	Sat May 26 17:03:09 2007
 @@ -43,18 +43,18 @@ SocksListenAddress 127.0.0.1 # accept connections only
  ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
  #Log debug file @LOCALSTATEDIR@/log/tor/debug.log
diff --git a/net/tor/patches/patch-src_or_config_c b/net/tor/patches/patch-src_or_config_c
new file mode 100644
index 00000000000..fcca4f82bd9
--- /dev/null
+++ b/net/tor/patches/patch-src_or_config_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_or_config_c,v 1.1 2007/05/26 17:09:05 rui Exp $
+--- src/or/config.c.orig	Fri May 25 01:51:40 2007
++++ src/or/config.c	Sat May 26 17:03:09 2007
+@@ -3901,7 +3901,7 @@ check_libevent_version(const char *m, int server)
+ #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+   if (server && version < LE_13B) {
+     thread_unsafe = 1;
+-    sad_os = "BSD variants"
++    sad_os = "BSD variants";
+       }
+ #elif defined(__APPLE__) || defined(__darwin__)
+   if (server && version < LE_13B) {