From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Oct 2009 01:30:53 +0000 (-0400)
Subject: Merge commit 'phobos/polipo-updates-maint-0.2.1' into maint-0.2.1
X-Git-Tag: tor-0.2.1.20~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1ab3bb410d58c1364f686bf908601588b6f68c5;p=thirdparty%2Ftor.git

Merge commit 'phobos/polipo-updates-maint-0.2.1' into maint-0.2.1
---

a1ab3bb410d58c1364f686bf908601588b6f68c5