Changeset 3922

Show
Ignore:
Timestamp:
09/23/06 11:34:24 (2 years ago)
Author:
hdm
Message:

Merge from 0.1.1.21 to 0.1.1.23

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • torment/trunk/AUTHORS

    • Property svn:keywords deleted

  • torment/trunk/ChangeLog

    • Property svn:keywords deleted
    r3683 r3922  
     1Changes in version 0.1.1.23 - 2006-07-30 
     2  o Major bugfixes: 
     3    - Fast Tor servers, especially exit nodes, were triggering asserts 
     4      due to a bug in handling the list of pending DNS resolves. Some 
     5      bugs still remain here; we're hunting them. 
     6    - Entry guards could crash clients by sending unexpected input. 
     7    - More fixes on reachability testing: if you find yourself reachable, 
     8      then don't ever make any client requests (so you stop predicting 
     9      circuits), then hup or have your clock jump, then later your IP 
     10      changes, you won't think circuits are working, so you won't try to 
     11      test reachability, so you won't publish. 
     12 
     13  o Minor bugfixes: 
     14    - Avoid a crash if the controller does a resetconf firewallports 
     15      and then a setconf fascistfirewall=1. 
     16    - Avoid an integer underflow when the dir authority decides whether 
     17      a router is stable: we might wrongly label it stable, and compute 
     18      a slightly wrong median stability, when a descriptor is published 
     19      later than now. 
     20    - Fix a place where we might trigger an assert if we can't build our 
     21      own server descriptor yet. 
     22 
     23 
     24Changes in version 0.1.1.22 - 2006-07-05 
     25  o Major bugfixes: 
     26    - Fix a big bug that was causing servers to not find themselves 
     27      reachable if they changed IP addresses. Since only 0.1.1.22+ 
     28      servers can do reachability testing correctly, now we automatically 
     29      make sure to test via one of these. 
     30    - Fix to allow clients and mirrors to learn directory info from 
     31      descriptor downloads that get cut off partway through. 
     32    - Directory authorities had a bug in deciding if a newly published 
     33      descriptor was novel enough to make everybody want a copy -- a few 
     34      servers seem to be publishing new descriptors many times a minute. 
     35  o Minor bugfixes: 
     36    - Fix a rare bug that was causing some servers to complain about 
     37      "closing wedged cpuworkers" and skip some circuit create requests. 
     38    - Make the Exit flag in directory status documents actually work. 
     39    - Add a preliminary OSX binary un-installer, and fix permissions. 
     40 
     41 
    142Changes in version 0.1.1.21 - 2006-06-10 
    243  o Crash and assert fixes from 0.1.1.20: 

  • torment/trunk/INSTALL

    • Property svn:keywords deleted

  • torment/trunk/LICENSE

    • Property svn:keywords deleted

  • torment/trunk/Makefile.am

    • Property svn:keywords deleted
    r3683 r3922  
    1 # $Id$ 
     1# $Id: Makefile.am 6438 2006-05-04 00:40:27Z phobos $ 
    22# Copyright (c) 2001-2004, Roger Dingledine 
    33# Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson 

  • torment/trunk/Makefile.in

    • Property svn:keywords deleted
    r3683 r3922  
    1111# PARTICULAR PURPOSE. 
    1212 
    13 # $Id$ 
     13# $Id: Makefile.am 6438 2006-05-04 00:40:27Z phobos $ 
    1414# Copyright (c) 2001-2004, Roger Dingledine 
    1515# Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson 

  • torment/trunk/README

    • Property svn:keywords deleted

  • torment/trunk/README.TORMENT

    • Property svn:keywords deleted

  • torment/trunk/aclocal.m4

    • Property svn:keywords deleted

  • torment/trunk/build.sh

    • Property svn:keywords deleted

  • torment/trunk/config.guess

    • Property svn:keywords deleted

  • torment/trunk/config.sub

    • Property svn:keywords deleted

  • torment/trunk/configure

    • Property svn:keywords deleted
    r3683 r3922  
    15051505PACKAGE=tor 
    15061506 
    1507 VERSION=0.1.1.21 
     1507VERSION=0.1.1.23 
    15081508 
    15091509if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then 

  • torment/trunk/configure.in

    • Property svn:keywords deleted
    r3683 r3922  
    1 dnl $Id$ 
     1dnl $Id: configure.in 6942 2006-07-30 04:40:27Z arma $ 
    22dnl Copyright (c) 2001-2004, Roger Dingledine 
    33dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson 
    …… 
    55 
    66AC_INIT 
    7 AM_INIT_AUTOMAKE(tor, 0.1.1.21) 
     7AM_INIT_AUTOMAKE(tor, 0.1.1.23) 
    88AM_CONFIG_HEADER(orconfig.h) 
    99 

  • torment/trunk/contrib/ExerciseServer.py

    • Property svn:keywords deleted

  • torment/trunk/contrib/Makefile.am

    • Property svn:keywords deleted

  • torment/trunk/contrib/Makefile.in

    • Property svn:keywords deleted
    r3921 r3922  
    213213installdirs-recursive install-recursive uninstall-recursive  \ 
    214214check-recursive installcheck-recursive info-recursive dvi-recursive: 
    215         @set fnord $$MAKEFLAGS; amf=$$2; \ 
     215        @set fnord $(MAKEFLAGS); amf=$$2; \ 
    216216        dot_seen=no; \ 
    217217        target=`echo $@ | sed s/-recursive//`; \ 
    …… 
    233233mostlyclean-recursive clean-recursive distclean-recursive \ 
    234234maintainer-clean-recursive: 
    235         @set fnord $$MAKEFLAGS; amf=$$2; \ 
     235        @set fnord $(MAKEFLAGS); amf=$$2; \ 
    236236        dot_seen=no; \ 
    237237        rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ 
    …… 
    279279               END { for (i in files) print i; }'`; \ 
    280280        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ 
    281           || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS) 
     281          || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP)) 
    282282 
    283283mostlyclean-tags: 

  • torment/trunk/contrib/PathDemo.py

    • Property svn:keywords deleted

  • torment/trunk/contrib/TorControl.py

    • Property svn:keywords deleted
    r3683 r3922  
    22# TorControl.py -- Python module to interface with Tor Control interface. 
    33# Copyright 2005 Nick Mathewson -- See LICENSE for licensing information. 
    4 #$Id$ 
     4#$Id: TorControl.py 4479 2005-06-24 18:05:43Z nickm $ 
    55 
    66#    THIS MODULE IS OBSOLETE! 

  • torment/trunk/contrib/exitlist

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/Makefile.am

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/Makefile.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/PrivoxyConfDesc.plist

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/PrivoxyConfInfo.plist

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/ReadMe.rtf

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/StartupParameters.plist

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/Tor

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/TorBundleDesc.plist.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/TorBundleInfo.plist.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/TorBundleWelcome.rtf

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/TorDesc.plist.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/TorInfo.plist.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/TorPostflight

    • Property svn:keywords deleted
    r3683 r3922  
    1414TORDIR=$TARGET/var/lib/tor 
    1515LOGDIR=$TARGET/var/log/tor 
     16 
     17# Check defaults for TARGET 
     18if [ "$TARGET" == "//Library/Tor" ]; then 
     19        TARGET=/Library/Tor 
     20fi 
    1621 
    1722# Create user $TORUSER in group daemon.  If it's already there, great. 

  • torment/trunk/contrib/osx/TorStartupDesc.plist.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/TorStartupInfo.plist

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/Tor_Uninstaller.applescript

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/addsysuser

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/package.sh

    • Property svn:keywords deleted
    r3683 r3922  
    11#!/bin/sh 
    2 # $Id$ 
     2# $Id: package.sh 6740 2006-07-06 16:28:52Z phobos $ 
    33# Copyright 2004-2005 Nick Mathewson. 
    44# See LICENSE in Tor distribution for licensing information. 
    …… 
    9494mkdir $DOC 
    9595mkdir $DOC/howto 
    96 cp doc/website/stylesheet.css doc/website/tor-doc-osx.html.* $DOC/howto 
    97 cp doc/website/tor-doc-server.html.* $DOC/howto 
    98 cp doc/website/tor-hidden-service.html.* $DOC/howto 
    99 cp doc/website/tor-switchproxy.html.* $DOC/howto 
     96#cp doc/website/stylesheet.css doc/website/tor-doc-osx.html.* $DOC/howto 
     97#cp doc/website/tor-doc-server.html.* $DOC/howto 
     98#cp doc/website/tor-hidden-service.html.* $DOC/howto 
     99#cp doc/website/tor-switchproxy.html.* $DOC/howto 
    100100#mkdir $DOC/img 
    101101#cp doc/img/screenshot-osx* $DOC/img 

  • torment/trunk/contrib/osx/package_list.txt

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/privoxy.config

    • Property svn:keywords deleted
    r3683 r3922  
    33#  Copyright (C) 2001-2004 Privoxy Developers http://privoxy.org 
    44#   
    5 #  $Id$ 
     5#  $Id: privoxy.config 5141 2005-09-24 20:49:45Z phobos $ 
    66#   
    77#################################################################### 

  • torment/trunk/contrib/osx/tor_logo.gif

    • Property svn:keywords deleted

  • torment/trunk/contrib/osx/uninstall_tor_bundle.sh

    • Property svn:keywords deleted

  • torment/trunk/contrib/rc.subr

    • Property svn:keywords deleted
    r3683 r3922  
    11#!/bin/sh 
    2 # $Id$ 
     2# $Id: rc.subr 6097 2006-03-08 07:30:07Z nickm $ 
    33# $FreeBSD: ports/security/tor-devel/files/tor.in,v 1.1 2006/02/17 22:21:25 mnag Exp $ 
    44# 

  • torment/trunk/contrib/suse/Makefile.am

    • Property svn:keywords deleted

  • torment/trunk/contrib/suse/Makefile.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/suse/tor.sh.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/tor-tsocks.conf

    • Property svn:keywords deleted

  • torment/trunk/contrib/tor.logrotate.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/tor.nsi.in

    • Property svn:keywords deleted
    r3683 r3922  
    3232!include "MUI.nsh" 
    3333 
    34 !define VERSION "0.1.1.21" 
     34!define VERSION "0.1.1.23" 
    3535!define INSTALLER "tor-${VERSION}-win32.exe" 
    3636!define WEBSITE "http://tor.eff.org/" 

  • torment/trunk/contrib/tor.sh.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/torctl.in

    • Property svn:keywords deleted

  • torment/trunk/contrib/torify.1

    • Property svn:keywords deleted

  • torment/trunk/contrib/torify.in

    • Property svn:keywords deleted

  • torment/trunk/doc/HACKING

    • Property svn:keywords deleted

  • torment/trunk/doc/Makefile.am

    • Property svn:keywords deleted
    r3683 r3922  
    88DIST_SUBDIRS = design-paper 
    99 
    10 website: ../../website/docs/ 
     10website: ../../../cvs/website/docs/ 
    1111        rm -rf website 
    1212        mkdir website 
    13         if test -d $(srcdir)/../../website ; then \ 
    14                 cd $(srcdir)/../../website && $(MAKE); \ 
     13        if test -d $(srcdir)/../../../cvs/website ; then \ 
     14                cd $(srcdir)/../../../cvs/website && $(MAKE); \ 
    1515        fi 
    16         if test -d $(srcdir)/../../website ; then \ 
    17                 cp $(srcdir)/../../website/docs/tor-*.html.* \ 
    18                         $(srcdir)/../../website/stylesheet.css website; \ 
     16        if test -d $(srcdir)/../../../cvs/website ; then \ 
     17                cp $(srcdir)/../../../cvs/website/docs/tor-*.html.* \ 
     18                        $(srcdir)/../../../cvs/website/stylesheet.css website; \ 
    1919        fi 
    20 img: ../../website/img/ 
     20img: ../../../cvs/website/img/ 
    2121        rm -rf img 
    2222        mkdir img 

  • torment/trunk/doc/Makefile.in

    • Property svn:keywords deleted
    r3683 r3922  
    159159installdirs-recursive install-recursive uninstall-recursive  \ 
    160160check-recursive installcheck-recursive info-recursive dvi-recursive: 
    161         @set fnord $$MAKEFLAGS; amf=$$2; \ 
     161        @set fnord $(MAKEFLAGS); amf=$$2; \ 
    162162        dot_seen=no; \ 
    163163        target=`echo $@ | sed s/-recursive//`; \ 
    …… 
    179179mostlyclean-recursive clean-recursive distclean-recursive \ 
    180180maintainer-clean-recursive: 
    181         @set fnord $$MAKEFLAGS; amf=$$2; \ 
     181        @set fnord $(MAKEFLAGS); amf=$$2; \ 
    182182        dot_seen=no; \ 
    183183        rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ 
    …… 
    225225               END { for (i in files) print i; }'`; \ 
    226226        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ 
    227           || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS) 
     227          || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP)) 
    228228 
    229229mostlyclean-tags: 
    …… 
    331331 
    332332 
    333 website: ../../website/docs/ 
     333website: ../../../cvs/website/docs/ 
    334334        rm -rf website 
    335335        mkdir website 
    336         if test -d $(srcdir)/../../website ; then \ 
    337                 cd $(srcdir)/../../website && $(MAKE); \ 
     336        if test -d $(srcdir)/../../../cvs/website ; then \ 
     337                cd $(srcdir)/../../../cvs/website && $(MAKE); \ 
    338338        fi 
    339         if test -d $(srcdir)/../../website ; then \ 
    340                 cp $(srcdir)/../../website/docs/tor-*.html.* \ 
    341                         $(srcdir)/../../website/stylesheet.css website; \ 
     339        if test -d $(srcdir)/../../../cvs/website ; then \ 
     340                cp $(srcdir)/../../../cvs/website/docs/tor-*.html.* \ 
     341                        $(srcdir)/../../../cvs/website/stylesheet.css website; \ 
    342342        fi 
    343 img: ../../website/img/ 
     343img: ../../../cvs/website/img/ 
    344344        rm -rf img 
    345345        mkdir img 

  • torment/trunk/doc/TODO

    • Property svn:keywords deleted
    r3683 r3922  
    1 $Id$ 
     1$Id: TODO 6348 2006-04-10 05:47:03Z arma $ 
    22Legend: 
    33SPEC!!  - Not specified 

  • torment/trunk/doc/control-spec.txt

    • Property svn:keywords deleted
    r3683 r3922  
    1 $Id$ 
     1$Id: control-spec.txt 6344 2006-04-09 23:48:12Z arma $ 
    22 
    33                   TC: A Tor control protocol (Version 1) 

  • torment/trunk/doc/design-paper/Makefile.am

    • Property svn:keywords deleted

  • torment/trunk/doc/design-paper/Makefile.in

    • Property svn:keywords deleted

  • torment/trunk/doc/design-paper/cell-struct.fig

    • Property svn:keywords deleted

  • torment/trunk/doc/design-paper/interaction.fig

    • Property svn:keywords deleted

  • torment/trunk/doc/design-paper/latex8.bst

    • Property svn:keywords deleted
    r3683 r3922  
    22% --------------------------------------------------------------- 
    33% 
    4 % $Id$ 
     4% $Id: latex8.bst 2163 2004-08-06 19:54:29Z weasel $ 
    55% 
    66% by Paolo.Ienne@di.epfl.ch 

  • torment/trunk/doc/design-paper/tor-design.bib

    • Property svn:keywords deleted

  • torment/trunk/doc/design-paper/tor-design.tex

    • Property svn:keywords deleted

  • torment/trunk/doc/design-paper/usenix.sty

    • Property svn:keywords deleted
    r3683 r3922  
    66% and put {\rm ....} around the author names. 
    77% 
    8 % $Id$ 
     8% $Id: usenix.sty 2163 2004-08-06 19:54:29Z weasel $ 
    99% 
    1010% The following definitions are modifications of standard article.sty 

  • torment/trunk/doc/dir-spec.txt

    • Property svn:keywords deleted
    r3683 r3922  
    1 $Id$ 
     1$Id: dir-spec.txt 6347 2006-04-10 05:46:56Z arma $ 
    22 
    33                  Tor directory protocol for 0.1.1.x series 

  • torment/trunk/doc/rend-spec.txt

    • Property svn:keywords deleted
    r3683 r3922  
    1 $Id$ 
     1$Id: rend-spec.txt 5909 2006-02-04 20:07:45Z arma $ 
    22 
    33                    Tor Rendezvous Specification 

  • torment/trunk/doc/socks-extensions.txt

    • Property svn:keywords deleted
    r3683 r3922  
    1 $Id$ 
     1$Id: socks-extensions.txt 5941 2006-02-09 03:44:49Z arma $ 
    22Tor's extensions to the SOCKS protocol 
    33 

  • torment/trunk/doc/tor-osx-dmg-creation.txt

    • Property svn:keywords deleted

  • torment/trunk/doc/tor-resolve.1

    • Property svn:keywords deleted

  • torment/trunk/doc/tor-rpm-creation.txt

    • Property svn:keywords deleted

  • torment/trunk/doc/tor-spec.txt

    • Property svn:keywords deleted
    r3683 r3922  
    1 $Id$ 
     1$Id: tor-spec.txt 5941 2006-02-09 03:44:49Z arma $ 
    22 
    33                         Tor Protocol Specification 

  • torment/trunk/doc/tor.1.in

    • Property svn:keywords deleted

  • torment/trunk/doc/version-spec.txt

    • Property svn:keywords deleted
    r3683 r3922  
    1 $Id$ 
     1$Id: version-spec.txt 5941 2006-02-09 03:44:49Z arma $ 
    22 
    33HOW TOR VERSION NUMBERS WORK 

  • torment/trunk/doc/website/stylesheet.css

    • Property svn:keywords deleted

  • torment/trunk/doc/website/tor-doc-osx.html.en

    • Property svn:keywords deleted
    r3683 r3922  
    2323        </td> 
    2424        <td class="banner-right"> 
    25         <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/en.png" alt="English" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <a href="tor-doc-osx.html.it"><img src="../images/it.png" alt="Italiano" width="24" height="16"></a> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> 
     25        <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/en.png" alt="English" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <a href="tor-doc-osx.html.fr"><img src="../images/fr.png" alt="fran&ccedil;ais" width="24" height="16"></a> <a href="tor-doc-osx.html.it"><img src="../images/it.png" alt="Italiano" width="24" height="16"></a> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> <img src="../images/green-flagspace.png" alt="" width="24" height="16"> 
    2626        </td> 
    2727    </tr> 
    …… 
    4343<p> 
    4444The latest stable and experimental releases of Tor for Macintosh 
    45 OS X bundle <a href="../index.html.en">Tor</a> and <a 
    46 href="http://www.privoxy.org">Privoxy</a> (a filtering web proxy) 
    47 into one package, with Privoxy pre-configured to proxy through Tor. 
     45OS X bundle <a href="../index.html.en">Tor</a>, 
     46<a href="http://www.vidalia-project.net/">Vidalia</a> (a GUI for Tor), 
     47and <a href="http://www.privoxy.org/">Privoxy</a> (a filtering web proxy) 
     48into one package, pre-configured to work together. 
    4849<a href="../download.html.en">Download one from the download 
    4950page</a>. 
    …… 
    5556src="../img/screenshot-osx-installer-splash.png" 
    5657border="1" width="620" height="440"> 
    57 <p> 
    58 By default, Tor is configured to run at startup. If you do not want Tor to 
    59 run on startup, you can disable this by selecting "Customize" in the 
    60 Installer, and then un-checking the "Tor Startup Script" box. Be sure to 
    61 leave the other boxes checked. 
    62 </p> 
    63 <p>Once the installer is finished and your computer restarts, Tor will 
    64 start automatically. Tor comes configured as a client by default. It 
    65 uses a built-in default configuration file in <tt>/Library/Tor/torrc</tt>, 
    66 but most people won't need to change any of the settings. Tor is now 
    67 installed.</p> 
     58<p>When the installer is finished, you can start Vidalia by selecting its icon 
     59from your Applications folder. A dark onion with a red X in your dock means 
     60Tor is not currently running. You can start Tor by selecting Start from the 
     61"Tor" menu at the top of your screen.