From: Roger Dingledine <arma@torproject.org>
Date: Sun, 9 Sep 2012 20:51:34 +0000 (-0400)
Subject: finish backing out 5492de76
X-Git-Tag: tor-0.2.4.2-alpha~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6639d5676f34234afaec9b49c89735724f7f67e;p=thirdparty%2Ftor.git

finish backing out 5492de76
---

diff --git a/src/or/connection.c b/src/or/connection.c
index 7a39e5e2df..d8f5d875c8 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2038,9 +2038,9 @@ connection_mark_all_noncontrol_connections(void)
 /** Return 1 if we should apply rate limiting to <b>conn</b>, and 0
  * otherwise.
  * Right now this just checks if it's an internal IP address or an
- * internal connection. We also check if the connection uses pluggable
- * transports, since we should then limit it even if it comes from an
- * internal IP address. */
+ * internal connection. We also should, but don't, check if the connection
+ * uses pluggable transports, since we should then limit it even if it
+ * comes from an internal IP address. */
 static int
 connection_is_rate_limited(connection_t *conn)
 {