diff --git a/net/tor/Makefile b/net/tor/Makefile
index 6fd0eab56d6..549ec63406a 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.39 2009/06/30 12:36:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.40 2009/08/10 21:14:41 benoit Exp $
 
 COMMENT=	anonymity service using onion routing
 
-DISTNAME=	tor-0.2.0.35
+DISTNAME=	tor-0.2.1.19
 CATEGORIES=	net
 HOMEPAGE=	http://www.torproject.org/
 
diff --git a/net/tor/distinfo b/net/tor/distinfo
index b337008b7c3..f0a7900cab3 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,5 +1,5 @@
-MD5 (tor-0.2.0.35.tar.gz) = 1IQeG01UhmSV/Tc+hlstRA==
-RMD160 (tor-0.2.0.35.tar.gz) = 7MmMYCtcFTqKqPbmURZnBbwFyXI=
-SHA1 (tor-0.2.0.35.tar.gz) = YhaIfgV1xKGPRuU/rqHr2wS/eQU=
-SHA256 (tor-0.2.0.35.tar.gz) = cYDFbBHhPRyoYON3Pd+yyflRkAZwIkoIUHZnlayUti4=
-SIZE (tor-0.2.0.35.tar.gz) = 2221852
+MD5 (tor-0.2.1.19.tar.gz) = LAypv10M+3cfTWvsnENgyg==
+RMD160 (tor-0.2.1.19.tar.gz) = NgbMV0reEq36jzx6GAlYhlvgd+g=
+SHA1 (tor-0.2.1.19.tar.gz) = iorxNUq1s/6ljiu//t3AXj3+2xc=
+SHA256 (tor-0.2.1.19.tar.gz) = y0+IrTDWukwBVzTzBYpuNRUc/1hvdwhpHVLSie540YM=
+SIZE (tor-0.2.1.19.tar.gz) = 2409484
diff --git a/net/tor/patches/patch-configure b/net/tor/patches/patch-configure
index 124b8d5c624..7b054eb83b9 100644
--- a/net/tor/patches/patch-configure
+++ b/net/tor/patches/patch-configure
@@ -1,12 +1,11 @@
-$OpenBSD: patch-configure,v 1.10 2009/01/24 14:53:57 rui Exp $
---- configure.orig	Wed Jan 21 17:38:09 2009
-+++ configure	Sat Jan 24 14:28:28 2009
-@@ -19472,7 +19472,7 @@ LOCALSTATEDIR=`eval echo $localstatedir`
+--- configure.orig	Tue Jul 28 23:44:16 2009
++++ configure	Mon Aug 10 23:02:40 2009
+@@ -19708,7 +19708,7 @@ LOCALSTATEDIR=`eval echo $localstatedir`
  # 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
+ if test "$GCC" = yes; then
 -  CFLAGS="$CFLAGS -Wall -g -O2"
-+  CFLAGS="$CFLAGS -Wall"
- else
-   CFLAGS="$CFLAGS -g -O"
-   enable_gcc_warnings=no
++  CFLAGS="$CFLAGS -Wall -g"
+   # Disable GCC's strict aliasing checks.  They are an hours-to-debug
+   # accident waiting to happen.
+   CFLAGS="$CFLAGS -fno-strict-aliasing"
diff --git a/net/tor/patches/patch-src_config_torrc_sample_in b/net/tor/patches/patch-src_config_torrc_sample_in
index 1f323e94b26..219d9aca902 100644
--- a/net/tor/patches/patch-src_config_torrc_sample_in
+++ b/net/tor/patches/patch-src_config_torrc_sample_in
@@ -1,6 +1,5 @@
-$OpenBSD: patch-src_config_torrc_sample_in,v 1.7 2008/09/19 21:51:00 rui Exp $
---- src/config/torrc.sample.in.orig	Tue Feb 26 19:56:28 2008
-+++ src/config/torrc.sample.in	Tue Aug  5 10:41:00 2008
+--- src/config/torrc.sample.in.orig	Mon May 25 19:38:04 2009
++++ src/config/torrc.sample.in	Mon Aug 10 23:02:40 2009
 @@ -37,18 +37,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
@@ -23,13 +22,10 @@ $OpenBSD: patch-src_config_torrc_sample_in,v 1.7 2008/09/19 21:51:00 rui Exp $
  
  ## The port on which Tor will listen for local connections from Tor
  ## controller applications, as documented in control-spec.txt.
-@@ -134,6 +134,9 @@ SocksListenAddress 127.0.0.1 # accept connections only
- #ExitPolicy accept *:119 # accept nntp as well as default exit policy
- #ExitPolicy reject *:* # no exits allowed
- #
+@@ -154,3 +154,6 @@ SocksListenAddress 127.0.0.1 # accept connections only
+ #BridgeRelay 1
+ #ExitPolicy reject *:*
+ 
 +## Revoke privileges
 +User _tor
 +Group _tor
- ################ This section is just for bridge relays ##############
- #
- ## Bridge relays (or "bridges" ) are Tor relays that aren't listed in the