- tor-commits - lists.torproject.org

r24936: {website} roughly zero people have the tails.boum.org CA in their brow (website/trunk/en)
by Andrew Lewman 02 Aug '11

02 Aug '11

Author: phobos Date: 2011-08-02 03:55:31 +0000 (Tue, 02 Aug 2011) New Revision: 24936 Modified: website/trunk/en/index.wml Log: roughly zero people have the tails.boum.org CA in their browser and will all freak out and bludgeon us with 'omg the cert is invalid!' emails, like they did on the blog when i linked to https:///tails.boum.org. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-08-02 03:48:26 UTC (rev 24935) +++ website/trunk/en/index.wml 2011-08-02 03:55:31 UTC (rev 24936) @@ -57,9 +57,9 @@ license: LGPL v2 --> <td> - <a href="https://tails.boum.org/"><img + <a href="http://tails.boum.org/"><img src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon"></a> - <h3><a href="https://tails.boum.org/">Tails</a></h3> + <h3><a href="http://tails.boum.org/">Tails</a></h3> <p>Live CD/USB distribution preconfigured to use Tor safely.</p> </td> <!-- Icon from Google

1 0

r24935: {website} Using the Google droid rather than Orbot logo on the front p (website/trunk/en)
by Damian Johnson 02 Aug '11

02 Aug '11

Author: atagar Date: 2011-08-02 03:48:26 +0000 (Tue, 02 Aug 2011) New Revision: 24935 Modified: website/trunk/en/index.wml Log: Using the Google droid rather than Orbot logo on the front page The official Android logo will be better recognizable to android users, which will hopefully translate into new Orbot users. I'm linking to the official andoid site to fulfill the attribution clause of using the logo. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-08-02 03:21:40 UTC (rev 24934) +++ website/trunk/en/index.wml 2011-08-02 03:48:26 UTC (rev 24935) @@ -62,11 +62,21 @@ <h3><a href="https://tails.boum.org/">Tails</a></h3> <p>Live CD/USB distribution preconfigured to use Tor safely.</p> </td> +  <td> <a href="https://guardianproject.info/apps/orbot/"><img - src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a> + src="$(IMGROOT)/icon-Orbot_andoidLogo.jpg" alt="Orbot Icon"></a> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3> - <p>Tor for Google Android devices.</p> + <p>Tor for <a href="https://code.google.com/android/">Google + Android</a> devices.</p> </td> </tr> <tr>

1 0

r24934: {website} Adding Tails, Orbot, TorStatus, and arm to the site front pa (in website/trunk: en images)
by Damian Johnson 02 Aug '11

02 Aug '11

Author: atagar Date: 2011-08-02 03:21:40 +0000 (Tue, 02 Aug 2011) New Revision: 24934 Added: website/trunk/images/icon-Arm.jpg website/trunk/images/icon-Orbot.jpg website/trunk/images/icon-Orbot_andoidLogo.jpg website/trunk/images/icon-Tails.jpg website/trunk/images/icon-TorStatus.jpg Modified: website/trunk/en/index.wml Log: Adding Tails, Orbot, TorStatus, and arm to the site front page This adds these four projects to the "Our Projects" section of the Tor front page. Unlike the previous projects that we had there (Torbutton, Tor Check, Vidalia, and TBB) these aren't part of the TBB ecosystem and hance not easily discovered. Having all eight projects feels cluttered to me and I'd suggest dropping Check and TBB since the user will be downloading and using these reguardless of a presence on the front page, but this is Andrew's call. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-08-02 02:04:16 UTC (rev 24933) +++ website/trunk/en/index.wml 2011-08-02 03:21:40 UTC (rev 24934) @@ -51,14 +51,59 @@ <div class="fauxhead"></div> <table style="table-layout: fixed;"> <tr> +  <td> - <img src="$(IMGROOT)/icon-TorButton.jpg" alt="Torbutton Icon"> + <a href="https://tails.boum.org/"><img + src="$(IMGROOT)/icon-Tails.jpg" alt="Tails Icon"></a> + <h3><a href="https://tails.boum.org/">Tails</a></h3> + <p>Live CD/USB distribution preconfigured to use Tor safely.</p> + </td> + <td> + <a href="https://guardianproject.info/apps/orbot/"><img + src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a> + <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3> + <p>Tor for Google Android devices.</p> + </td> + </tr> + <tr> +  + <td> + <a href="http://torstatus.blutmagie.de/"><img + src="$(IMGROOT)/icon-TorStatus.jpg" alt="TorStatus Icon"></a> + <h3><a href="http://torstatus.blutmagie.de/">TorStatus</a></h3> + <p>Site providing an overview of the Tor network.</p> + </td> +  + <td> + <a href="http://www.atagar.com/arm/"><img + src="$(IMGROOT)/icon-Arm.jpg" alt="Arm Icon"></a> + <h3><a href="http://www.atagar.com/arm/">Arm</a></h3> + <p>Terminal application for monitoring and configuring Tor.</p> + </td> + </tr> + <tr> + <td> + <a href="<page torbutton/index>"><img + src="$(IMGROOT)/icon-TorButton.jpg" alt="Torbutton Icon"></a> <h3><a href="<page torbutton/index>">Torbutton</a></h3> <p>Torbutton is a 1-click way for Firefox users to enable or disable Tor in Firefox.</p> </td> <td> - <img src="$(IMGROOT)/icon-TorCheck.jpg" alt="Tor Check Icon"> + <a href="https://check.torproject.org/"><img + src="$(IMGROOT)/icon-TorCheck.jpg" alt="Tor Check Icon"></a> <h3><a href="https://check.torproject.org/">Check</a></h3> <p>Check determines if you are successfully browsing with Tor.</p> @@ -66,13 +111,15 @@ </tr> <tr> <td> - <img src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon"> + <a href="<page projects/vidalia>"><img + src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon"></a> <h3><a href="<page projects/vidalia>">Vidalia</a></h3> <p>Vidalia is a graphical way to control and view Tor's connections and settings.</p> </td> <td> - <img src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"> + <a href="<page projects/torbrowser>"><img + src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"></a> <h3><a href="<page projects/torbrowser>">Tor Browser</a></h3> <p>Tor Browser contains everything you need to safely Added: website/trunk/images/icon-Arm.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/icon-Arm.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/images/icon-Orbot.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/icon-Orbot.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/images/icon-Orbot_andoidLogo.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/icon-Orbot_andoidLogo.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/images/icon-Tails.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/icon-Tails.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/images/icon-TorStatus.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/icon-TorStatus.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r24933: {website} Replacing low resolution tor logo with higher resolution ver (in website/trunk: css images)
by Damian Johnson 02 Aug '11

02 Aug '11

Author: atagar Date: 2011-08-02 02:04:16 +0000 (Tue, 02 Aug 2011) New Revision: 24933 Added: website/trunk/images/tor-logo_low_resolution.jpg Modified: website/trunk/css/layout.css website/trunk/images/tor-logo.jpg Log: Replacing low resolution tor logo with higher resolution version The tor logo in the upper left is a low quality version (solid color onion stem, no anti-aliasing, etc). This looks really bad and I suggested this replacement months back but didn't get any feedback so gonna try 'moving the cheese' to see if anyone screams. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-01 23:59:39 UTC (rev 24932) +++ website/trunk/css/layout.css 2011-08-02 02:04:16 UTC (rev 24933) @@ -46,7 +46,7 @@ background: url(../images/tor-logo.jpg) left top no-repeat; text-indent: -9999px; overflow: hidden; - width: 150px; + width: 160px; height: 97px; display: block; } Modified: website/trunk/images/tor-logo.jpg =================================================================== (Binary files differ) Added: website/trunk/images/tor-logo_low_resolution.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tor-logo_low_resolution.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r24932: {website} update the step two link. (website/trunk/docs/en)
by Andrew Lewman 01 Aug '11

01 Aug '11

Author: phobos Date: 2011-08-01 23:59:39 +0000 (Mon, 01 Aug 2011) New Revision: 24932 Modified: website/trunk/docs/en/debian-vidalia.wml website/trunk/docs/en/debian.wml website/trunk/docs/en/rpms.wml Log: update the step two link. Modified: website/trunk/docs/en/debian-vidalia.wml =================================================================== --- website/trunk/docs/en/debian-vidalia.wml 2011-08-01 21:01:43 UTC (rev 24931) +++ website/trunk/docs/en/debian-vidalia.wml 2011-08-01 23:59:39 UTC (rev 24932) @@ -64,7 +64,7 @@ <p> Now Vidalia is installed and running. Move on to <a href="<page -docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix" +docs/tor-doc-unix>#using">step two</a> of the "Vidalia on Linux/Unix" instructions. </p> @@ -111,7 +111,7 @@ <p> Now Vidalia is installed and running. Move on to <a href="<page -docs/tor-doc-unix>#polipo">step two</a> of the "Vidalia on Linux/Unix" +docs/tor-doc-unix>#using">step two</a> of the "Vidalia on Linux/Unix" instructions. </p> Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2011-08-01 21:01:43 UTC (rev 24931) +++ website/trunk/docs/en/debian.wml 2011-08-01 23:59:39 UTC (rev 24932) @@ -29,7 +29,7 @@ <p> Now Tor is installed and running. Move on to <a href="<page -docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix" +docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions. </p> @@ -92,7 +92,7 @@ <p> Now Tor is installed and running. Move on to <a href="<page -docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix" +docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions. </p> @@ -137,7 +137,7 @@ <p> Now Tor is installed and running. Move on to <a href="<page -docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix" +docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions. </p> @@ -180,7 +180,7 @@ <p> Now Tor is installed and running. Move on to <a href="<page -docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix" +docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions. </p> Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2011-08-01 21:01:43 UTC (rev 24931) +++ website/trunk/docs/en/rpms.wml 2011-08-01 23:59:39 UTC (rev 24932) @@ -47,7 +47,7 @@ <p> Now Tor is installed and running. Move on to <a href="<page - docs/tor-doc-unix>#polipo">step two</a> of the "Tor on Linux/Unix" + docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix" instructions. </p>

1 0

r24931: {website} confirm the trend that $5 is better than $10. (website/trunk/download/en)
by Andrew Lewman 01 Aug '11

01 Aug '11

Author: phobos Date: 2011-08-01 21:01:43 +0000 (Mon, 01 Aug 2011) New Revision: 24931 Modified: website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml Log: confirm the trend that $5 is better than $10. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-07-28 13:56:00 UTC (rev 24930) +++ website/trunk/download/en/download-easy.wml 2011-08-01 21:01:43 UTC (rev 24931) @@ -70,7 +70,7 @@ <option value="GBP">£</option> <option value="YEN">¥</option> </select> - <input type="text" id="amount" class="amount" name="amount" value="10" size="10"> + <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> </p> <p> <input type="hidden" id="a3" name="a3" value="0"> Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-07-28 13:56:00 UTC (rev 24930) +++ website/trunk/download/en/download.wml 2011-08-01 21:01:43 UTC (rev 24931) @@ -63,7 +63,7 @@ <option value="GBP">£</option> <option value="YEN">¥</option> </select> - <input type="text" id="amount" class="amount" name="amount" value="10" size="10"> + <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> </p> <p> <input type="hidden" id="a3" name="a3" value="0">

1 0

[tor/master] put the 0.2.1.30 stanza in the master changelog too
by arma＠torproject.org 01 Aug '11

01 Aug '11

commit 478785a762ebbfc1c95192d9cfd4617bd87d9d16 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 1 16:14:17 2011 -0400 put the 0.2.1.30 stanza in the master changelog too --- ChangeLog | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb7e170..36ebece 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1019,6 +1019,57 @@ Changes in version 0.2.2.23-alpha - 2011-03-08 git://git.torproject.org/torspec.git +Changes in version 0.2.1.30 - 2011-02-23 + Tor 0.2.1.30 fixes a variety of less critical bugs. The main other + change is a slight tweak to Tor's TLS handshake that makes relays + and bridges that run this new version reachable from Iran again. + We don't expect this tweak will win the arms race long-term, but it + buys us time until we roll out a better solution. + + o Major bugfixes: + - Stop sending a CLOCK_SKEW controller status event whenever + we fetch directory information from a relay that has a wrong clock. + Instead, only inform the controller when it's a trusted authority + that claims our clock is wrong. Bugfix on 0.1.2.6-alpha; fixes + the rest of bug 1074. + - Fix a bounds-checking error that could allow an attacker to + remotely crash a directory authority. Bugfix on 0.2.1.5-alpha. + Found by "piebeer". + - If relays set RelayBandwidthBurst but not RelayBandwidthRate, + Tor would ignore their RelayBandwidthBurst setting, + potentially using more bandwidth than expected. Bugfix on + 0.2.0.1-alpha. Reported by Paul Wouters. Fixes bug 2470. + - Ignore and warn if the user mistakenly sets "PublishServerDescriptor + hidserv" in her torrc. The 'hidserv' argument never controlled + publication of hidden service descriptors. Bugfix on 0.2.0.1-alpha. + + o Minor features: + - Adjust our TLS Diffie-Hellman parameters to match those used by + Apache's mod_ssl. + - Update to the February 1 2011 Maxmind GeoLite Country database. + + o Minor bugfixes: + - Check for and reject overly long directory certificates and + directory tokens before they have a chance to hit any assertions. + Bugfix on 0.2.1.28. Found by "doorss". + - Bring the logic that gathers routerinfos and assesses the + acceptability of circuits into line. This prevents a Tor OP from + getting locked in a cycle of choosing its local OR as an exit for a + path (due to a .exit request) and then rejecting the circuit because + its OR is not listed yet. It also prevents Tor clients from using an + OR running in the same instance as an exit (due to a .exit request) + if the OR does not meet the same requirements expected of an OR + running elsewhere. Fixes bug 1859; bugfix on 0.1.0.1-rc. + + o Packaging changes: + - Stop shipping the Tor specs files and development proposal documents + in the tarball. They are now in a separate git repository at + git://git.torproject.org/torspec.git + - Do not include Git version tags as though they are SVN tags when + generating a tarball from inside a repository that has switched + between branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. + + Changes in version 0.2.2.22-alpha - 2011-01-25 Tor 0.2.2.22-alpha fixes a few more less-critical security issues. The main other change is a slight tweak to Tor's TLS handshake that makes

1 0

[tor/release-0.2.2] put the 0.2.1.30 stanza in the 0.2.2 changelog
by arma＠torproject.org 01 Aug '11

01 Aug '11

commit 13f1d2f0eccfa26d5061e5969c7d17265d7af797 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 1 16:13:12 2011 -0400 put the 0.2.1.30 stanza in the 0.2.2 changelog --- ChangeLog | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f17d9e0..686fcb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -754,6 +754,57 @@ Changes in version 0.2.2.23-alpha - 2011-03-08 git://git.torproject.org/torspec.git +Changes in version 0.2.1.30 - 2011-02-23 + Tor 0.2.1.30 fixes a variety of less critical bugs. The main other + change is a slight tweak to Tor's TLS handshake that makes relays + and bridges that run this new version reachable from Iran again. + We don't expect this tweak will win the arms race long-term, but it + buys us time until we roll out a better solution. + + o Major bugfixes: + - Stop sending a CLOCK_SKEW controller status event whenever + we fetch directory information from a relay that has a wrong clock. + Instead, only inform the controller when it's a trusted authority + that claims our clock is wrong. Bugfix on 0.1.2.6-alpha; fixes + the rest of bug 1074. + - Fix a bounds-checking error that could allow an attacker to + remotely crash a directory authority. Bugfix on 0.2.1.5-alpha. + Found by "piebeer". + - If relays set RelayBandwidthBurst but not RelayBandwidthRate, + Tor would ignore their RelayBandwidthBurst setting, + potentially using more bandwidth than expected. Bugfix on + 0.2.0.1-alpha. Reported by Paul Wouters. Fixes bug 2470. + - Ignore and warn if the user mistakenly sets "PublishServerDescriptor + hidserv" in her torrc. The 'hidserv' argument never controlled + publication of hidden service descriptors. Bugfix on 0.2.0.1-alpha. + + o Minor features: + - Adjust our TLS Diffie-Hellman parameters to match those used by + Apache's mod_ssl. + - Update to the February 1 2011 Maxmind GeoLite Country database. + + o Minor bugfixes: + - Check for and reject overly long directory certificates and + directory tokens before they have a chance to hit any assertions. + Bugfix on 0.2.1.28. Found by "doorss". + - Bring the logic that gathers routerinfos and assesses the + acceptability of circuits into line. This prevents a Tor OP from + getting locked in a cycle of choosing its local OR as an exit for a + path (due to a .exit request) and then rejecting the circuit because + its OR is not listed yet. It also prevents Tor clients from using an + OR running in the same instance as an exit (due to a .exit request) + if the OR does not meet the same requirements expected of an OR + running elsewhere. Fixes bug 1859; bugfix on 0.1.0.1-rc. + + o Packaging changes: + - Stop shipping the Tor specs files and development proposal documents + in the tarball. They are now in a separate git repository at + git://git.torproject.org/torspec.git + - Do not include Git version tags as though they are SVN tags when + generating a tarball from inside a repository that has switched + between branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. + + Changes in version 0.2.2.22-alpha - 2011-01-25 Tor 0.2.2.22-alpha fixes a few more less-critical security issues. The main other change is a slight tweak to Tor's TLS handshake that makes

1 0

[tor/master] reach back in time and correct two changelog entries
by arma＠torproject.org 01 Aug '11

01 Aug '11

commit 843796495b2fef3219d460f2bcaa4f54481883a6 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 1 15:53:13 2011 -0400 reach back in time and correct two changelog entries --- ChangeLog | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 824c19b..fb7e170 100644 --- a/ChangeLog +++ b/ChangeLog @@ -391,7 +391,7 @@ Changes in version 0.2.2.26-beta - 2011-05-17 - Authorities now clean their microdesc cache periodically and when reading from disk initially, not only when adding new descriptors. This prevents a bug where we could lose microdescriptors. Bugfix - on 0.2.2.6-alpha. 2230 + on 0.2.2.6-alpha. Fixes bug 2230. - Do not crash when our configuration file becomes unreadable, for example due to a permissions change, between when we start up and when a controller calls SAVECONF. Fixes bug 3135; bugfix @@ -2679,8 +2679,9 @@ Changes in version 0.2.2.5-alpha - 2009-10-11 o Major bugfixes: - Make the tarball compile again. Oops. Bugfix on 0.2.2.4-alpha. - o New directory authorities: - - Move dizum to an alternate IP address. + o Directory authorities: + - Temporarily (just for this release) move dizum to an alternate + IP address. Changes in version 0.2.2.4-alpha - 2009-10-10

1 0

[tor/master] Initial patch to build Tor with msvc and nmake
by nickm＠torproject.org 01 Aug '11

01 Aug '11

commit e802199cb3a2ebb4c09eaf4949e279acd3b46fc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 1 12:36:59 2011 -0400 Initial patch to build Tor with msvc and nmake We'll still need to tweak it so that it looks for includes and libraries somewhere more sensible than "where we happened to find them on Erinn's system"; so that tests and tools get built too; so that it's a bit documented; and so that we actually try running the output. Work done with Erinn Clark. --- Makefile.am | 1 + Makefile.nmake | 5 +++++ changes/nmake | 3 +++ src/common/Makefile.am | 2 +- src/common/Makefile.nmake | 20 ++++++++++++++++++++ src/common/torgzip.c | 4 ---- src/common/util.c | 6 +++--- src/or/Makefile.am | 2 +- src/or/Makefile.nmake | 28 ++++++++++++++++++++++++++++ src/or/networkstatus.c | 7 ------- src/win32/orconfig.h | 10 ++++++++++ 11 files changed, 72 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0daca63..cd0d883 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ EXTRA_DIST = \ ChangeLog \ INSTALL \ LICENSE \ + Makefile.nmake \ README \ ReleaseNotes \ tor.spec \ diff --git a/Makefile.nmake b/Makefile.nmake new file mode 100644 index 0000000..425f1ec --- /dev/null +++ b/Makefile.nmake @@ -0,0 +1,5 @@ +all: + cd src/common + $(MAKE) /F Makefile.nmake + cd ../../src/or + $(MAKE) /F Makefile.nmake diff --git a/changes/nmake b/changes/nmake new file mode 100644 index 0000000..47f4f8f --- /dev/null +++ b/changes/nmake @@ -0,0 +1,3 @@ + o Minor features (build compatibility): + - Limited, experimental support for building with nmake and MSVC. + diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 4821849..2244fe5 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,7 +1,7 @@ noinst_LIBRARIES = libor.a libor-crypto.a libor-event.a -EXTRA_DIST = common_sha1.i sha256.c +EXTRA_DIST = common_sha1.i sha256.c Makefile.nmake #CFLAGS = -Wall -Wpointer-arith -O2 diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake new file mode 100644 index 0000000..c8b5988 --- /dev/null +++ b/src/common/Makefile.nmake @@ -0,0 +1,20 @@ +all: libor.lib libor-crypto.lib libor-event.lib + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include + +LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ + log.obj memarea.obj mempool.obj procmon.obj util.obj \ + util_codedigest.obj + +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj + +LIBOR_EVENT_OBJECTS = compat_libevent.obj + +libor.lib: $(LIBOR_OBJECTS) + lib $(LIBOR_OBJECTS) /out:libor.lib + +libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS) + lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib + +libor-event.lib: $(LIBOR_EVENT_OBJECTS) + lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 2937c67..ae7d7cf 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -43,11 +43,7 @@ #define off64_t int64_t #endif -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else #include <zlib.h> -#endif /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ diff --git a/src/common/util.c b/src/common/util.c index 15b6e71..601f2be 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -14,6 +14,9 @@ #define _GNU_SOURCE #include "orconfig.h" +#ifdef HAVE_FCNTL_H +#include <fcntl.h> +#endif #define UTIL_PRIVATE #include "util.h" #include "torlog.h" @@ -68,9 +71,6 @@ #ifdef HAVE_SYS_FCNTL_H #include <sys/fcntl.h> #endif -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif #ifdef HAVE_TIME_H #include <time.h> #endif diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 344e63f..e2a1b6d 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -7,7 +7,7 @@ else tor_platform_source= endif -EXTRA_DIST=ntmain.c or_sha1.i +EXTRA_DIST=ntmain.c or_sha1.i Makefile.nmake if USE_EXTERNAL_EVDNS evdns_source= diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake new file mode 100644 index 0000000..919edbb --- /dev/null +++ b/src/or/Makefile.nmake @@ -0,0 +1,28 @@ +all: tor.exe + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common + +LIBS = ..\..\..\build-alpha\lib\libevent.a \ + ..\..\..\build-alpha\lib\libcrypto.a \ + ..\..\..\build-alpha\lib\libssl.a \ + ..\..\..\build-alpha\lib\libz.a \ + ws2_32.lib advapi32.lib shell32.lib + +LIBTOR_OBJECTS = buffers.obj circuitbuild.obj circuitlist.obj circuituse.obj \ + command.obj config.obj connection.obj connection_edge.obj \ + connection_or.obj control.obj cpuworker.obj directory.obj \ + dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj \ + hibernate.obj main.obj microdesc.obj networkstatus.obj \ + nodelist.obj onion.obj policies.obj reasons.obj relay.obj \ + rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \ + rephist.obj router.obj routerlist.obj routerparse.obj status.obj \ + config_codedigest.obj ntmain.obj + +libtor.lib: $(LIBTOR_OBJECTS) + lib $(LIBTOR_OBJECTS) /out:libtor.lib + +tor.exe: libtor.lib tor_main.obj + $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj + +clean: + del $(LIBTOR_OBJECTS) *.lib tor.exe diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 2586ce6..868c2a2 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2006,13 +2006,6 @@ routers_update_status_from_consensus_networkstatus(smartlist_t *routers, tor_memcmp(rs->identity_digest, router->cache_info.identity_digest, DIGEST_LEN), { -#if 0 - /* We have no routerstatus for this router. Clear flags and skip it. */ - if (!authdir) { - if (router->purpose == ROUTER_PURPOSE_GENERAL) - router_clear_status_flags(router); - } -#endif }) { /* We have a routerstatus for this router. */ const char *digest = router->cache_info.identity_digest; diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ed6da8e..cf49339 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -122,6 +122,7 @@ /* Define to 1 if you have the <sys/socket.h> header file. */ #undef HAVE_SYS_SOCKET_H + /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H @@ -234,3 +235,12 @@ /* Version number of package */ #define VERSION "0.2.3.2-alpha-dev" + + + +#define HAVE_STRUCT_SOCKADDR_IN6 +#define HAVE_STRUCT_IN6_ADDR +#define RSHIFT_DOES_SIGN_EXTEND +#define FLEXIBLE_ARRAY_MEMBER 0 +#define HAVE_EVENT2_EVENT_H +#define SHARE_DATADIR ""

1 0