- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 28 Mar '11

28 Mar '11

commit 22f7042b9184d4463429072d788d52f4fc75e866 Merge: 4762118 3a7cee9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 17:49:34 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/zlib_aint_openssl | 3 +++ configure.in | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.1] Fix configure.in zlib package names.
by nickm＠torproject.org 28 Mar '11

28 Mar '11

commit 3a7cee9d2984126ef8378657d6200f711eb58517 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 15 02:15:42 2011 +0100 Fix configure.in zlib package names. --- changes/zlib_aint_openssl | 3 +++ configure.in | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/zlib_aint_openssl b/changes/zlib_aint_openssl new file mode 100644 index 0000000..dd8e10a --- /dev/null +++ b/changes/zlib_aint_openssl @@ -0,0 +1,3 @@ + o Minor bugfixes + - When warning about missing zlib development packages, give the + correct package names. Bugfix on 0.2.0.1-alpha. diff --git a/configure.in b/configure.in index 7cdb330..1fddaca 100644 --- a/configure.in +++ b/configure.in @@ -336,10 +336,10 @@ AC_SUBST(TOR_OPENSSL_LIBS) dnl ------------------------------------------------------ dnl Where do you live, zlib? And how do we call you? -tor_openssl_pkg_redhat="zlib" -tor_openssl_pkg_debian="zlib1g" -tor_openssl_devpkg_redhat="zlib-devel" -tor_openssl_devpkg_debian="zlib1g-dev" +tor_zlib_pkg_redhat="zlib" +tor_zlib_pkg_debian="zlib1g" +tor_zlib_devpkg_redhat="zlib-devel" +tor_zlib_devpkg_debian="zlib1g-dev" TOR_SEARCH_LIBRARY(zlib, $tryzlibdir, [-lz], [#include <zlib.h>],

1 0

r24495: {website} Remove spurious whitespace A Fedora user reported that the s (website/trunk/docs/en)
by Robert Ransom 28 Mar '11

28 Mar '11

Author: rransom Date: 2011-03-28 21:12:32 +0000 (Mon, 28 Mar 2011) New Revision: 24495 Modified: website/trunk/docs/en/rpms.wml Log: Remove spurious whitespace A Fedora user reported that the spaces at the beginning of each line broke yum. Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2011-03-28 21:11:51 UTC (rev 24494) +++ website/trunk/docs/en/rpms.wml 2011-03-28 21:12:32 UTC (rev 24495) @@ -24,15 +24,14 @@ You'll need to set up our package repository before you can fetch Tor. Assuming yum, in /etc/yum.repos.d/, create a file called torproject.repo. Edit this file with the following information: - <pre>[torproject] - name=Tor and Vidalia - enabled=1 - autorefresh=0 - baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/ - type=rpm-md - gpgcheck=1 - gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.… - </pre> +<pre>[torproject] +name=Tor and Vidalia +enabled=1 +autorefresh=0 +baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/ +type=rpm-md +gpgcheck=1 +gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org</pre> If you wish to track the stable releases of Tor, you should substitute DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse</p>

1 0

r24494: {website} Minor language cleanup (website/trunk/docs/en)
by Robert Ransom 28 Mar '11

28 Mar '11

Author: rransom Date: 2011-03-28 21:11:51 +0000 (Mon, 28 Mar 2011) New Revision: 24494 Modified: website/trunk/docs/en/rpms.wml Log: Minor language cleanup Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2011-03-28 21:11:24 UTC (rev 24493) +++ website/trunk/docs/en/rpms.wml 2011-03-28 21:11:51 UTC (rev 24494) @@ -11,11 +11,11 @@ </div> <div id="maincol"> <a id="rpms"></a> - <h2><a class="anchor" href="#rpms">Tor packages for rpm-based + <h2><a class="anchor" href="#rpms">Tor packages for RPM-based linux distributions.</a></h2> <br> - <p>Do not use the packages in the native repositories. They are + <p><strong>Do not</strong> use the packages in the native repositories. They are frequently out of date. That means you'll be missing stability and security fixes. </p> @@ -54,8 +54,9 @@ <p style="font-size: small"> The DNS name <code>deb.torproject.org</code> is actually a set of independent - servers in a DNS round robin configuration. If you for some reason cannot - access it you might try to use the name of one of its part instead. Try + servers in a DNS round-robin configuration. If for some reason you cannot + use it, you might be able to access one of the individual servers + instead. Try <code>deb-master.torproject.org</code>, <code>mirror.netcologne.de</code> or <code>tor.mirror.youam.de</code>. @@ -71,7 +72,7 @@ <p> If you'd like to build from source, please follow the <a - href="<gitblob>doc/tor-rpm-creation.txt">rpm creation instructions</a>. + href="<gitblob>doc/tor-rpm-creation.txt">RPM creation instructions</a>. </p> <hr>

1 0

r24493: {website} Tell users to install Tor before saying 'Tor is installed' (website/trunk/docs/en)
by Robert Ransom 28 Mar '11

28 Mar '11

Author: rransom Date: 2011-03-28 21:11:24 +0000 (Mon, 28 Mar 2011) New Revision: 24493 Modified: website/trunk/docs/en/rpms.wml Log: Tell users to install Tor before saying 'Tor is installed' Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2011-03-28 18:12:55 UTC (rev 24492) +++ website/trunk/docs/en/rpms.wml 2011-03-28 21:11:24 UTC (rev 24493) @@ -40,6 +40,11 @@ <p>To track experimental releases, substitute DISTRIBUTION with one of these: centos4-experimental, centos5-experimental, fc13-experimental, fc14-experimental, suse-experimental</p> + + <p> + Then install Tor by running: + </p> +<pre>yum install tor</pre> <p> Now Tor is installed and running. Move on to <a href="<page

1 0

r24492: {website} Advertise tor-assistants@torproject.org, not @lists.tpo Too (website/trunk/about/en)
by Robert Ransom 28 Mar '11

28 Mar '11

Author: rransom Date: 2011-03-28 18:12:55 +0000 (Mon, 28 Mar 2011) New Revision: 24492 Modified: website/trunk/about/en/contact.wml Log: Advertise tor-assistants(a)torproject.org, not @lists.tpo Too many people want to subscribe to it when they know it's currently a list run by lists.tpo. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-03-28 16:20:25 UTC (rev 24491) +++ website/trunk/about/en/contact.wml 2011-03-28 18:12:55 UTC (rev 24492) @@ -18,7 +18,7 @@ <p>If you really do need to reach us, here are some approaches. Please be patient and <a href="http://www.catb.org/~esr/faqs/smart-questions.html">helpful</a>, and please make sure to write your mail in English.</p> - <i>tor-assistants at lists.torproject.org</i> is the catch-all address for everything. It can be + <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be used for: <ul>

1 0

[tor/master] Small tweaks for bug2698 bugfix
by nickm＠torproject.org 28 Mar '11

28 Mar '11

commit 47621188328c19be18a6915f937e4e0f7e04fba8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Mar 27 05:35:17 2011 +0200 Small tweaks for bug2698 bugfix --- changes/bug2698 | 9 ++++++--- configure.in | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/changes/bug2698 b/changes/bug2698 index 3c2468f..d995788 100644 --- a/changes/bug2698 +++ b/changes/bug2698 @@ -1,3 +1,6 @@ - o Minor build issues - - We incorrectly linked libevent when configured with - --enable-static-libevent. Fixes bug 2698. + o Minor bugfixes: + - Fix an issue that prevented static linking of libevent on + some platforms (notably Linux). Fixes bug 2698, bugfix on + versions 0.2.1.23/0.2.2.8-alpha (the versions introducing + the --with-static-libevent configure option). + diff --git a/configure.in b/configure.in index bd94174..6ed43ce 100644 --- a/configure.in +++ b/configure.in @@ -280,8 +280,6 @@ if test "$enable_static_libevent" = "yes"; then [have_rt=yes]) if test "$have_rt" = yes; then STATIC_LIBEVENT_FLAGS=" -lrt " - else - STATIC_LIBEVENT_FLAGS="" fi fi

1 0

[tor/master] Fix libevent autoconf bug #2698
by nickm＠torproject.org 28 Mar '11

28 Mar '11

commit b62abf9f21499abda5b703271d5663a2a7380ca0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Mar 16 18:35:31 2011 -0700 Fix libevent autoconf bug #2698 --- changes/bug2698 | 3 +++ configure.in | 20 +++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/changes/bug2698 b/changes/bug2698 new file mode 100644 index 0000000..3c2468f --- /dev/null +++ b/changes/bug2698 @@ -0,0 +1,3 @@ + o Minor build issues + - We incorrectly linked libevent when configured with + --enable-static-libevent. Fixes bug 2698. diff --git a/configure.in b/configure.in index 4436fe2..bd94174 100644 --- a/configure.in +++ b/configure.in @@ -271,7 +271,21 @@ tor_libevent_pkg_debian="libevent-dev" tor_libevent_devpkg_redhat="libevent-devel" tor_libevent_devpkg_debian="libevent-dev" -TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $TOR_LIB_WS32], [ +dnl On Gnu/Linux or any place we require it, we'll add librt to the Libevent +dnl linking for static builds. +STATIC_LIBEVENT_FLAGS="" +if test "$enable_static_libevent" = "yes"; then + dnl Determine if we have clock_gettime in librt + AC_SEARCH_LIBS([clock_gettime], [rt], + [have_rt=yes]) + if test "$have_rt" = yes; then + STATIC_LIBEVENT_FLAGS=" -lrt " + else + STATIC_LIBEVENT_FLAGS="" + fi +fi + +TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32], [ #ifdef WIN32 #include <winsock2.h> #endif @@ -294,7 +308,7 @@ dnl Now check for particular libevent functions. save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" save_CPPFLAGS="$CPPFLAGS" -LIBS="-levent $TOR_LIB_WS32 $LIBS" +LIBS="-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32 $LIBS" LDFLAGS="$TOR_LDFLAGS_libevent $LDFLAGS" CPPFLAGS="$TOR_CPPFLAGS_libevent $CPPFLAGS" AC_CHECK_FUNCS(event_get_version event_get_version_number event_get_method event_set_log_callback evdns_set_outgoing_bind_address event_base_loopexit) @@ -315,7 +329,7 @@ if test "$enable_static_libevent" = "yes"; then if test "$tor_cv_library_libevent_dir" = "(system)"; then AC_MSG_ERROR("You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent") else - TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a" + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a $STATIC_LIBEVENT_FLAGS" fi else TOR_LIBEVENT_LIBS="-levent"

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 28 Mar '11

28 Mar '11

commit 18126f92a74e9e1d81f9abf02bda2f5458c32bc6 Merge: 8b393af 4762118 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 12:17:35 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2698 | 6 ++++++ configure.in | 18 +++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-)

1 0

r24491: {arm} Config option to toggle application resolution for SOCKS and (in arm/trunk: . src/interface/connections)
by Damian Johnson 28 Mar '11

28 Mar '11

Author: atagar Date: 2011-03-28 16:20:25 +0000 (Mon, 28 Mar 2011) New Revision: 24491 Modified: arm/trunk/armrc.sample arm/trunk/src/interface/connections/connPanel.py Log: Config option to toggle application resolution for SOCKS and CONTROL connections. Modified: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.sample 2011-03-28 16:10:51 UTC (rev 24490) +++ arm/trunk/armrc.sample 2011-03-28 16:20:25 UTC (rev 24491) @@ -175,6 +175,9 @@ # connection resolution rate then reducing this won't casue new data to # appear more frequently - just increase the rate at which the uptime field # is updated) +# resolveApps +# issues lsof queries to determining the applications involved in local +# SOCKS and CONTROL connections # markInitialConnections # if true, the uptime of the initial connections when we start are marked # with a '+' (these uptimes are estimates since arm can only track a @@ -189,6 +192,7 @@ features.connection.listingType 0 features.connection.order 0, 2, 1 features.connection.refreshRate 5 +features.connection.resolveApps true features.connection.markInitialConnections true features.connection.showExitPort true features.connection.showColumn.fingerprint true Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-03-28 16:10:51 UTC (rev 24490) +++ arm/trunk/src/interface/connections/connPanel.py 2011-03-28 16:20:25 UTC (rev 24491) @@ -9,7 +9,8 @@ from interface.connections import entries, connEntry, circEntry from util import connections, enum, panel, torTools, uiTools -DEFAULT_CONFIG = {"features.connection.listingType": 0, +DEFAULT_CONFIG = {"features.connection.resolveApps": True, + "features.connection.listingType": 0, "features.connection.refreshRate": 5} # height of the detail panel content, not counting top and bottom border @@ -332,7 +333,7 @@ until the next update if true """ - if self.appResolveSinceUpdate: return + if self.appResolveSinceUpdate or not self._config["features.connection.resolveApps"]: return # fetch the unresolved SOCKS and CONTROL lines unresolvedLines = []

1 0