diff --git a/lib/config.js b/lib/config.js
index 0435cfc6..7d07ecc3 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -49,7 +49,8 @@ var defaults = {
     "stat-interval"         : 3600000,
     "stat-max-age"          : 86400000,
     "alias-purge-interval"  : 3600000,
-    "alias-max-age"         : 2592000000
+    "alias-max-age"         : 2592000000,
+    "tor-blocker"           : false
 }
 
 function save(cfg, file) {
diff --git a/lib/server.js b/lib/server.js
index c4ee563e..5b7167a0 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "2.4.4";
+const VERSION = "2.4.5";
 var singleton = null;
 
 module.exports = {
@@ -63,6 +63,7 @@ var Server = function (cfg) {
     self.httplog = null;
     self.actionlog = null;
     self.infogetter = null;
+    self.torblocker = null;
 
     // database init ------------------------------------------------------
     var Database = require("./database");
@@ -169,6 +170,11 @@ var Server = function (cfg) {
 
     // background tasks init ----------------------------------------------
     require("./bgtask")(self);
+
+    // tor blocker init ---------------------------------------------------
+    if (self.cfg["tor-blocker"]) {
+        self.torblocker = require("./torblocker")();
+    }
 };
 
 Server.prototype.getHTTPIP = function (req) {
@@ -268,6 +274,15 @@ Server.prototype.handleSocketConnection = function (socket) {
     var ip = self.getSocketIP(socket);
     socket._ip = ip;
 
+    if (self.torblocker && self.torblocker.shouldBlockIP(ip)) {
+        socket.emit("kick", {
+            reason: "This server does not allow connections from Tor.  "+
+                    "Please log in with your regular internet connection."
+        });
+        Logger.syslog.log("Blocked Tor IP: " + ip);
+        socket.disconnect(true);
+    }
+
     if (!(ip in self.ipThrottle)) {
         self.ipThrottle[ip] = $util.newRateLimiter();
     }
diff --git a/lib/torblocker.js b/lib/torblocker.js
new file mode 100644
index 00000000..9fee4706
--- /dev/null
+++ b/lib/torblocker.js
@@ -0,0 +1,85 @@
+var https = require("https");
+var path = require("path");
+var fs = require("fs");
+var domain = require("domain");
+var Logger = require("./logger");
+
+function retrieveIPs(cb) {
+    var options = {
+        host: "www.dan.me.uk",
+        port: 443,
+        path: "/torlist/",
+        method: "GET"
+    };
+
+    var finish = function (status, data) {
+        if (status !== 200) {
+            cb(new Error("Failed to retrieve Tor IP list (HTTP " + status + ")"), null);
+            return;
+        }
+
+        var ips = data.split("\n");
+        cb(false, ips);
+    };
+
+    var d = domain.create();
+    d.on("error", function (err) {
+        Logger.errlog.log(err.trace());
+    });
+    
+    d.run(function () {
+        var req = https.request(options, function (res) {
+            var buffer = "";
+            res.setEncoding("utf-8");
+            res.on("data", function (data) { buffer += data; });
+            res.on("end", function () { finish(res.statusCode, buffer); });
+        });
+        
+        req.end();
+    });
+}
+
+function getTorIPs(cb) {
+    retrieveIPs(function (err, ips) {
+        if (!err) {
+            cb(false, ips);
+            fs.writeFile(path.join(__dirname, "..", "torlist"),
+                         ips.join("\n"));
+            return;
+        }
+
+        fs.readFile(path.join(__dirname, "..", "torlist"), function (err, data) {
+            if (err) {
+                cb(err, null);
+                return;
+            }
+
+            data = (""+data).split("\n");
+            cb(false, data);
+        });
+    });
+}
+
+module.exports = function () {
+    var x = {
+        ipList: [],
+        shouldBlockIP: function (ip) {
+            return this.ipList.indexOf(ip) >= 0;
+        }
+    };
+
+    var init = function () { 
+        getTorIPs(function (err, ips) {
+            if (err) {
+                Logger.errlog.log(err);
+                return;
+            }
+
+            Logger.syslog.log("Loaded Tor IP list");
+            x.ipList = ips;
+        });
+    };
+
+    init();
+    return x;
+};
diff --git a/package.json b/package.json
index c4eeaf70..b2050639 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "2.4.4",
+    "version": "2.4.5",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },