diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/bundle.nsi | 2 | ||||
| -rwxr-xr-x | contrib/checkSpace.pl | 12 | ||||
| -rw-r--r-- | contrib/netinst.nsi | 2 | ||||
| -rw-r--r-- | contrib/polipo/README | 2 | ||||
| -rw-r--r-- | contrib/tor-exit-notice.html | 1 | ||||
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 2 |
6 files changed, 13 insertions, 8 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/checkSpace.pl b/contrib/checkSpace.pl index db061a0828..b694abff64 100755 --- a/contrib/checkSpace.pl +++ b/contrib/checkSpace.pl @@ -28,11 +28,15 @@ for $fn (@ARGV) { if ($C && /\s(?:if|while|for|switch)\(/) { print " KW(:$fn:$.\n"; } - ## Warn about #else #if instead of #elif. - if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { + ## Warn about #else #if instead of #elif. + if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { print " #else#if:$fn:$.\n"; - } - $lastline = $_; + } + $lastline = $_; + ## Warn about unnecessary empty lines. + if ($lastnil && /^\s*}\n/) { + print " UnnecNL:$fn:$.\n"; + } ## Warn about multiple empty lines. if ($lastnil && /^$/) { print " DoubleNL:$fn:$.\n"; 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 diff --git a/contrib/tor-exit-notice.html b/contrib/tor-exit-notice.html index 78a148ccc6..8b37edc3fe 100644 --- a/contrib/tor-exit-notice.html +++ b/contrib/tor-exit-notice.html @@ -29,6 +29,7 @@ They are marked with FIXME. Tor Exit Router</p> <p> +Most likely you are accessing this website because you had some issue with the traffic coming from this IP. This router is part of the <a href="https://www.torproject.org/">Tor Anonymity Network</a>, which is dedicated to <a href="https://www.torproject.org/overview.html">providing diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index de382a78a6..523ca760da 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.2.9-alpha-dev" +!define VERSION "0.2.2.10-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" |