aboutsummaryrefslogtreecommitdiff
path: root/contrib/polipo
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-27 17:16:31 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-27 17:16:31 -0500
commitb006e3279f72b5d1e966107a08d9b5c916915131 (patch)
treed8e1045df0e5825ce9eabf590c35303dd218c301 /contrib/polipo
parent1c25077b1ced61ef9b4179d9718959e678794900 (diff)
parentc3e63483b2f16eb1717035eac4c14315b95671f5 (diff)
downloadtor-b006e3279f72b5d1e966107a08d9b5c916915131.tar
tor-b006e3279f72b5d1e966107a08d9b5c916915131.tar.gz
Merge remote branch 'origin/maint-0.2.1'
Conflicts: src/common/test.h src/or/test.c
Diffstat (limited to 'contrib/polipo')
-rw-r--r--contrib/polipo/README2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/polipo/README b/contrib/polipo/README
index 8bc23a09d..6670d579e 100644
--- a/contrib/polipo/README
+++ b/contrib/polipo/README
@@ -1,5 +1,5 @@
Copyright 2007-2008 Andrew Lewman
-Copyright 2009 The Tor Project
+Copyright 2009-2010 The Tor Project
----------------
General Comments