diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:51:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:51:17 -0500 |
| commit | f1de329e784e76dbb27cde148522a6c490e7cf63 (patch) | |
| tree | 3d3fea0781bfa37410a932e7d7345af25f845ea9 /contrib | |
| parent | e895919b171029df4d38285b0be4483376b4ad25 (diff) | |
| parent | 1a07348a50ec679c8b7bb1abb45e61a9ebcc69a9 (diff) | |
| download | tor-f1de329e784e76dbb27cde148522a6c490e7cf63.tar tor-f1de329e784e76dbb27cde148522a6c490e7cf63.tar.gz | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
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 | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/contrib/bundle.nsi b/contrib/bundle.nsi index ffc64df3c..55f6b5fa3 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-2010, Roger Dingledine, Nick Mathewson, The Tor Project, Inc." +VIAddVersionKey "LegalCopyright" "©2004-2011, 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 622310e9a..08d950ab0 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-2010, Roger Dingledine, Nick Mathewson, The Tor Project, Inc." +VIAddVersionKey "LegalCopyright" "©2004-2011, 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 98deec3e4..1110ca273 100644 --- a/contrib/polipo/README +++ b/contrib/polipo/README @@ -1,5 +1,5 @@ -Copyright 2007-2008 Andrew Lewman -Copyright 2009-2010 The Tor Project +Copyright 2007-2008, Andrew Lewman +Copyright 2009-2011, The Tor Project ---------------- General Comments |