Re: stable: update Tor?
On Thu, 21 Jan 2010, Philipp Kern wrote:
> On Thu, Jan 21, 2010 at 10:36:00AM +0100, Peter Palfrader wrote:
> > Please let me know if I may upload such a package.
>
> Both fixes are acceptable. I found it a tad funny that the mail wasn't
> signed, but apart from that, please go ahead.
Great, thanks. Just uploaded.
interdiff:
diff -u tor-0.2.0.35/debian/changelog tor-0.2.0.35/debian/changelog
--- tor-0.2.0.35/debian/changelog
+++ tor-0.2.0.35/debian/changelog
@@ -1,3 +1,14 @@
+tor (0.2.0.35-1~lenny2) stable; urgency=medium
+
+ * Two of the authority keys 0.2.0.35 ships with got rotated recently.
+ To make sure Tor keeps working, update the list of authorities to
+ the list shipped in 0.2.1.22 and 0.2.2.7-alpha.
+ * Fix race condition that can cause crashes at client or exit relay
+ (closes: #557654). (Backport from 0.2.1.x, original commit id:
+ a89f51c936f8bd3c2aef3e9472d5310c83dc8fa7.)
+
+ -- Peter Palfrader <weasel@debian.org> Thu, 21 Jan 2010 14:27:32 +0100
+
tor (0.2.0.35-1~lenny1) stable; urgency=low
* Upload to stable in coordination with SRM (luk).
diff -u tor-0.2.0.35/debian/patches/00list tor-0.2.0.35/debian/patches/00list
--- tor-0.2.0.35/debian/patches/00list
+++ tor-0.2.0.35/debian/patches/00list
@@ -5,0 +6,2 @@
+update-authorities
+backport-83dc8fa7
only in patch2:
unchanged:
--- tor-0.2.0.35.orig/debian/patches/backport-83dc8fa7.dpatch
+++ tor-0.2.0.35/debian/patches/backport-83dc8fa7.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## backport-83dc8fa7.dpatch by <weasel@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix race condition that can cause crashes at client or exit relay
+
+# taken from 0.2.1.x tree:
+#commit a89f51c936f8bd3c2aef3e9472d5310c83dc8fa7
+#Author: Roger Dingledine <arma@torproject.org>
+#Date: Mon Nov 23 10:13:50 2009 -0500
+#
+# fix race condition that can cause crashes at client or exit relay
+#
+# Avoid crashing if the client is trying to upload many bytes and the
+# circuit gets torn down at the same time, or if the flip side
+# happens on the exit relay. Bugfix on 0.2.0.1-alpha; fixes bug 1150.
+
+@DPATCH@
+diff -urNad tor~/src/or/circuitlist.c tor/src/or/circuitlist.c
+--- tor~/src/or/circuitlist.c 2010-01-21 14:18:29.000000000 +0100
++++ tor/src/or/circuitlist.c 2010-01-21 14:22:10.715060262 +0100
+@@ -1037,6 +1037,7 @@
+ edge_connection_t *conn;
+ for (conn=or_circ->n_streams; conn; conn=conn->next_stream)
+ connection_edge_destroy(or_circ->p_circ_id, conn);
++ or_circ->n_streams = NULL;
+
+ while (or_circ->resolving_streams) {
+ conn = or_circ->resolving_streams;
+@@ -1060,6 +1061,7 @@
+ edge_connection_t *conn;
+ for (conn=ocirc->p_streams; conn; conn=conn->next_stream)
+ connection_edge_destroy(circ->n_circ_id, conn);
++ ocirc->p_streams = NULL;
+ }
+
+ circ->marked_for_close = line;
only in patch2:
unchanged:
--- tor-0.2.0.35.orig/debian/patches/update-authorities.dpatch
+++ tor-0.2.0.35/debian/patches/update-authorities.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## update-authorities.dpatch by <weasel@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update the list of authorities and their keys to the list
+## DP: currently found in tor versions 0.2.1.22 and 0.2.2.7-alpha.
+
+@DPATCH@
+diff -urNad tor~/src/or/config.c tor/src/or/config.c
+--- tor~/src/or/config.c 2010-01-21 14:18:29.000000000 +0100
++++ tor/src/or/config.c 2010-01-21 14:18:35.899058000 +0100
+@@ -831,24 +831,27 @@
+ {
+ int i;
+ const char *dirservers[] = {
+- "moria1 v1 orport=9001 v3ident=E2A2AF570166665D738736D0DD58169CC61D8A8B "
+- "128.31.0.34:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441",
++ "moria1 orport=9101 no-v2 "
++ "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
++ "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
+ "moria2 v1 orport=9002 128.31.0.34:9032 "
+ "719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF",
+ "tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
+ "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
+ "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
+ "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+- "Tonga orport=443 bridge no-v2 82.94.251.206:80 "
++ "Tonga orport=443 bridge no-v2 82.94.251.203:80 "
+ "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
+ "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
+ "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",
+- "gabelmoo orport=443 no-v2 "
+- "v3ident=81349FC1F2DBA2C2C11B45CB9706637D480AB913 "
+- "80.190.246.100:80 6833 3D07 61BC F397 A587 A0C0 B963 E4A9 E99E C4D3",
++ "gabelmoo orport=8080 no-v2 "
++ "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
++ "80.190.246.100:8180 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
+ "dannenberg orport=443 no-v2 "
+ "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+ "213.73.91.31:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
++ "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
++ "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
+ NULL
+ };
+ for (i=0; dirservers[i]; i++) {
--
| .''`. ** Debian GNU/Linux **
Peter Palfrader | : :' : The universal
http://www.palfrader.org/ | `. `' Operating System
| `- http://www.debian.org/
Reply to: