diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-02-27 17:16:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-02-27 17:16:31 -0500 |
| commit | b006e3279f72b5d1e966107a08d9b5c916915131 (patch) | |
| tree | d8e1045df0e5825ce9eabf590c35303dd218c301 /contrib | |
| parent | 1c25077b1ced61ef9b4179d9718959e678794900 (diff) | |
| parent | c3e63483b2f16eb1717035eac4c14315b95671f5 (diff) | |
| download | tor-b006e3279f72b5d1e966107a08d9b5c916915131.tar.gz tor-b006e3279f72b5d1e966107a08d9b5c916915131.zip | |
Merge remote branch 'origin/maint-0.2.1'
Conflicts:
src/common/test.h
src/or/test.c
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bundle.nsi | 2 | ||||
| -rw-r--r-- | contrib/netinst.nsi | 2 | ||||
| -rw-r--r-- | contrib/polipo/README | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/bundle.nsi b/contrib/bundle.nsi index 0f1d82f3e6..ffc64df3c8 100644 --- a/contrib/bundle.nsi +++ b/contrib/bundle.nsi @@ -22,7 +22,7 @@ VIProductVersion "${VERSION}" VIAddVersionKey "ProductName" "Tor" VIAddVersionKey "Comments" "${WEBSITE}" VIAddVersionKey "LegalTrademarks" "Three line BSD" -VIAddVersionKey "LegalCopyright" "©2004-2009, Roger Dingledine, Nick Mathewson, The Tor Project, Inc." +VIAddVersionKey "LegalCopyright" "©2004-2010, Roger Dingledine, Nick Mathewson, The Tor Project, Inc." VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}" VIAddVersionKey "FileVersion" "${VERSION}" diff --git a/contrib/netinst.nsi b/contrib/netinst.nsi index ef93aa0700..622310e9a3 100644 --- a/contrib/netinst.nsi +++ b/contrib/netinst.nsi @@ -22,7 +22,7 @@ VIProductVersion "${VERSION}" VIAddVersionKey "ProductName" "Tor" VIAddVersionKey "Comments" "${WEBSITE}" VIAddVersionKey "LegalTrademarks" "Three line BSD" -VIAddVersionKey "LegalCopyright" "©2004-2009, Roger Dingledine, Nick Mathewson, The Tor Project, Inc." +VIAddVersionKey "LegalCopyright" "©2004-2010, Roger Dingledine, Nick Mathewson, The Tor Project, Inc." VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}" VIAddVersionKey "FileVersion" "${VERSION}" diff --git a/contrib/polipo/README b/contrib/polipo/README index 8bc23a09d9..6670d579ec 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 |