diff -Nru squid3-3.1.19/debian/changelog squid3-3.1.19/debian/changelog
--- squid3-3.1.19/debian/changelog	2012-04-12 13:56:52.000000000 -0700
+++ squid3-3.1.19/debian/changelog	2012-04-20 11:11:02.000000000 -0700
@@ -1,3 +1,13 @@
+squid3 (3.1.19-1ubuntu3) precise-proposed; urgency=low
+
+  * debian/rules: re-enable all hardening options lost in the
+    squid->squid3 transition (LP: #986314)
+  * debian/squid3.upstart: move ulimit command to script section
+    so that it applies to the started squid daemon. Thanks to Timur
+    Irmatov (LP: #986159
+
+ -- Steve Beattie <sbeattie@ubuntu.com>  Fri, 20 Apr 2012 11:09:46 -0700
+
 squid3 (3.1.19-1ubuntu2) precise; urgency=low
 
   * debian/NEWS.Debian: Rename NEWS.debian, add note regarding squid3
diff -Nru squid3-3.1.19/debian/rules squid3-3.1.19/debian/rules
--- squid3-3.1.19/debian/rules	2012-04-12 13:57:10.000000000 -0700
+++ squid3-3.1.19/debian/rules	2012-04-19 23:48:14.000000000 -0700
@@ -1,7 +1,9 @@
 #! /usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/dpkg/buildflags.mk
  
 INSTALLDIR := $(CURDIR)/debian/tmp
 datadir=/usr/share/squid3
diff -Nru squid3-3.1.19/debian/squid3.upstart squid3-3.1.19/debian/squid3.upstart
--- squid3-3.1.19/debian/squid3.upstart	2012-04-12 13:45:27.000000000 -0700
+++ squid3-3.1.19/debian/squid3.upstart	2012-04-20 11:08:36.000000000 -0700
@@ -47,9 +47,6 @@
 	then
 		/usr/sbin/squid3 $SQUID_ARGS -z -f $CONFIG
 	fi
-
-	umask 027
-	ulimit -n 65535
 end script
 
 script
@@ -57,5 +54,7 @@
 		. /etc/default/squid3
 	fi
 
+	umask 027
+	ulimit -n 65535
 	exec /usr/sbin/squid3 -N $SQUID_ARGS -f $CONFIG
 end script