- tor-commits - lists.torproject.org

r25559: {} add my IEEE presentation from tonight. (in projects/presentations: . images)
by Andrew Lewman 20 Mar '12

20 Mar '12

Author: phobos Date: 2012-03-20 03:14:24 +0000 (Tue, 20 Mar 2012) New Revision: 25559 Added: projects/presentations/2012-03-19-IEEE-Boston-Presentation.pdf projects/presentations/2012-03-19-IEEE-Boston-Presentation.tex projects/presentations/images/ScreenHunter_03_Jun_26_18_11.png projects/presentations/images/dataflow-futureprivacychart.png projects/presentations/images/thankyou_img.jpg Log: add my IEEE presentation from tonight. Added: projects/presentations/2012-03-19-IEEE-Boston-Presentation.pdf =================================================================== (Binary files differ) Property changes on: projects/presentations/2012-03-19-IEEE-Boston-Presentation.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: projects/presentations/2012-03-19-IEEE-Boston-Presentation.tex =================================================================== --- projects/presentations/2012-03-19-IEEE-Boston-Presentation.tex (rev 0) +++ projects/presentations/2012-03-19-IEEE-Boston-Presentation.tex 2012-03-20 03:14:24 UTC (rev 25559) @@ -0,0 +1,212 @@ +\documentclass{beamer} +\mode<presentation> +\usetheme{Boadilla} +\title{IEEE: Social Implications of Technology} +\author{Andrew Lewman \\ andrew(a)torproject.org} +\date{March 19, 2012} +\begin{document} + +\begin{frame} +\maketitle +\begin{center} +\includegraphics[height=3cm]{./images/2009-tor-logo} +\end{center} +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/1984first} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{George Orwell was an optimist} +\begin{quotation} +\noindent \includegraphics[width=1cm]{./images/opquo}\quad Who controls the past, controls the future: who controls the present controls the past +\end{quotation} +\flushright --- George Orwell, Nineteen Eighty Four, 1949 +\end{frame} + +\begin{frame} +\frametitle{Internet Surveillance is getting more advanced} +\begin{center} +\includegraphics<1>[scale=0.5]{./images/procera-evolved-dpi} +\includegraphics<2>[scale=0.5]{./images/iran-ssl-dpi-26-seconds-to-death} +\includegraphics<3>[scale=0.6]{./images/2011-infoweek-comodo-hacker} +\includegraphics<4>[scale=0.6]{./images/al-jazeera-egypt-crackdown-US-co-ties} +\includegraphics<5>[scale=0.6]{./images/2011-06-08-china-net-censorship-piracy-porn} +\includegraphics<6>[scale=0.6]{./images/2011-06-23-cnet-us-internet-censorship-voluntary} +\includegraphics<7>[scale=0.4]{./images/dataflow-futureprivacychart} +\includegraphics<8>[scale=0.5]{./images/google_tracking} +\includegraphics<9>[scale=0.3]{./images/mediacom-ad-injection-apple} +\includegraphics<10>[scale=0.3]{./images/mediacom-ad-injection-google} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Twitter in Iran: Good.} +\includegraphics[scale=0.5]{./images/twitter-iran-protests-time} +\flushright{\tiny From http://www.time.com/time/world/article/0,8599,1905125,00.html} +\end{frame} + +\begin{frame} +\frametitle{Twitter in USA: Bad.} +\includegraphics[scale=0.45]{./images/twitter-g20-pittsburgh-gothamist} +\flushright{\tiny from http://gothamist.com/2009/10/05/fbi\_raids\_queens\_home\_in\_g20\_protes.p… +\end{frame} + +\begin{frame}[plain] + \begin{centering} + \pgfimage[height=\paperheight]{./images/paco-primera-pagina-oleo-lienzo-110-x-150-cms-2008-red} + \par + \end{centering} +\end{frame} + +\begin{frame} +\frametitle{The Tor Project, Inc.} +501(c)(3) non-profit organization dedicated to the research and development of technologies for online anonymity and privacy +\begin{center} +\includegraphics[height=5cm]{./images/2009-oval_sticker_new} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{What is Tor?} +\begin{itemize} +\item online anonymity software and network +\pause \item open source, freely available (3-clause BSD license) +\pause \item active research environment: \\ +Drexel, Univ of Waterloo, Georgia Tech, Princeton, Boston University, University College London, Univ of Minnesota, National Science Foundation, Naval Research Labs, Cambridge UK, Bamberg Germany, MIT... +\pause \item increasingly diverse toolset: \\ +Tor, Tor Browser Bundle, Tails LiveCD, obfsproxy, Tor Weather, Tor auto-responder, Secure Updater, Orbot, Torora, Tor Check, Arm, Nymble, Tor Control, and so on. +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Other Systems} +\begin{itemize} +\item VPN - Virtual Private Network, 1 to 1 connection, can redirect all traffic, generally encrypted +\pause \item Proxy - 1 to 1 connection, per application traffic redirection, sometimes encrypted +\pause \item I2P - Garlic routing, closed network, anonymity and reputation +\pause \item Freenet - closed network, anonymity, distributed file storage and sharing +\pause \item GNUnet - closed network, anonymity, distributed file storage and sharing +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{How is Tor different from other systems?} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[height=7cm]{./images/single_hop_relay}} +\only<2>{\includegraphics[height=7cm]{./images/evil_single_hop_relay}} +\only<3>{\includegraphics[height=7cm]{./images/data_snooping_single_hop_relay}} +\end{overlayarea} +\end{frame} + +\begin{frame} +\frametitle{Who uses Tor?} +\parbox{8cm}{\sloppy \setbeamercolor{background}[\includegraphics[scale=0.35]{./images/anonymousman}} +\parbox{3cm}{\sloppy +\begin{flushleft} +\begin{itemize} +\begin{small} +\item Normal people +\item Law Enforcement +\item Human Rights Activists +\item Business Execs +\item Militaries +\item Abuse Victims +\end{small} +\end{itemize} +\end{flushleft} +} +\end{frame} + +\begin{frame} +\frametitle{Who uses Tor?} +\begin{itemize} +\item <1> \textit{Normal users} \\ linking sensitive information to their current identities, online advertising networks, search engines, censorship circumvention +\item <2> \textit{Law enforcement}\\ accidental disclosure to targets, family and friend concerns, separating work from home life +\item <3> \textit{Rights Activists}\\ Personal safety, family safety, narrowly-defined publicity, censorship circumvention +\item <4> \textit{Business Execs}\\ separating work from home life, competitor research, censorship circumvention +\item <5> \textit{Abuse Victims and Survivors}\\ complete separation of past abuse and current life, finding help and safety, need to help others anonymously +\item <6> \textit{Militaries}\\ intelligence gathering, separating work from home life, other activities +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Online and Offline change happens} +\includegraphics[scale=0.5]{./images/egypt} +\end{frame} + +\begin{frame} +\frametitle{You missed a use case} +\includegraphics<1>[scale=0.5]{./images/zscaler-research-security-blocks-dec2011} +\includegraphics<2>[scale=0.8]{./images/ScreenHunter_03_Jun_26_18_11} +\includegraphics<3>[scale=1.0]{./images/tripoli-internet-monitoring-room-sign} +\includegraphics<4>[scale=0.5]{./images/zhejiang-china-brick-workers-tie-up-their-children-01-560x399} +\end{frame} + +\begin{frame}[plain] +\frametitle{estimated 400k to 800k daily users} +\includegraphics[scale=0.4]{./images/huge-crowd} +\end{frame} + +\begin{frame} +\frametitle{Tor hides communication patterns by relaying data through volunteer servers} +\begin{center} +\begin{overlayarea}{9cm}{6cm} +\only<1>{\includegraphics[width=9cm]{./images/tor-network}} +\only<2>{\includegraphics[width=9cm]{./images/tor-safe-selection}} +\only<3>{\includegraphics[width=9cm]{./images/tor-safe-path}} +\only<4>{\includegraphics[width=9cm]{./images/tor-keys1}} +\end{overlayarea} +\flushright{\tiny Diagram: Robert Watson} +\end{center} +\end{frame} + +\begin{frame} +\frametitle{Vidalia Network Map} +\includegraphics[scale=0.4]{./images/vidalia-network-map} +\end{frame} + +\begin{frame} +\frametitle{Metrics} +\begin{itemize} +\item Measuring metrics anonymously +\item NSF research grant +\item Archive of hourly consensus, ExoneraTor, VisiTor +\item Metrics portal: \\ \url{https://metrics.torproject.org/} +\end{itemize} +\end{frame} + +\begin{frame} +\frametitle{Tor hidden services allow privacy enhanced hosting} +\includegraphics[scale=0.5]{./images/hidden-federalist} +\end{frame} + +\begin{frame} +\frametitle{dot onion you say?} +\includegraphics[scale=0.6]{./images/hidden-federalist-zoom} +\end{frame} + +\begin{frame} +\frametitle{Thanks!} +\includegraphics[scale=0.6]{./images/thankyou_img} +\flushright +Visit \url{https://www.torproject.org/} for more information, links, and ideas. +\end{frame} + +\begin{frame} +\frametitle{Credits \& Thanks} +\begin{itemize} +\item applied theory, third image: Information Week,2011-04-09, http://www.informationweek.com/news/security/attacks/229400850 +\item applied theory, fourth image: Al Jazeera, February 2011 +\item spring is in the air, Paco Pomet, http://pacopomet.wordpress.com/ +\item who uses tor? \url{http://www.flickr.com/photos/mattw/2336507468/siz}, Matt Westervelt, CC-BY-SA. +\item danger!, \url{http://flickr.com/photos/hmvh/58185411/sizes/o/}, hmvh, CC-BY-SA. +\item 500k, \url{http://www.flickr.com/photos/lukaskracic/334850378/sizes/l/}, Luka Skracic, used with permission. +\end{itemize} +\end{frame} + +\end{document} Property changes on: projects/presentations/2012-03-19-IEEE-Boston-Presentation.tex ___________________________________________________________________ Added: svn:mime-type + text/x-tex Added: projects/presentations/images/ScreenHunter_03_Jun_26_18_11.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/ScreenHunter_03_Jun_26_18_11.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/dataflow-futureprivacychart.png =================================================================== (Binary files differ) Property changes on: projects/presentations/images/dataflow-futureprivacychart.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: projects/presentations/images/thankyou_img.jpg =================================================================== (Binary files differ) Property changes on: projects/presentations/images/thankyou_img.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg

1 0

r25558: {website} patch from jeremy to fix the mac tbb link issues. (in website/trunk: download/en include)
by Andrew Lewman 20 Mar '12

20 Mar '12

Author: phobos Date: 2012-03-20 02:03:30 +0000 (Tue, 20 Mar 2012) New Revision: 25558 Modified: website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml website/trunk/include/dlhead.wmi Log: patch from jeremy to fix the mac tbb link issues. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2012-03-19 20:58:42 UTC (rev 25557) +++ website/trunk/download/en/download-easy.wml 2012-03-20 02:03:30 UTC (rev 25558) @@ -12,8 +12,8 @@ # <define-tag button-win-tbb32>Tor Browser Bundle</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> -<define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag> -<define-tag button-osx-tbb64>Mac 64-bit (Beta)</define-tag> +<define-tag button-osx-tbb32>Tor Browser Bundle</define-tag> +<define-tag button-osx-tbb64>Mac 64-bit</define-tag> <define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag> <define-tag button-lin-tbb64>Linux 64-bit (Beta)</define-tag> @@ -50,20 +50,20 @@ <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> - <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip">Mac</a>, <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a>, or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux 64-bit</a></p> + <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip">Mac</a>, <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a>, or <a class="lin-alt64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz">Linux 64-bit</a></p> </div> </div>  <div class="easy mac"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> + <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> @@ -78,13 +78,13 @@ <div class="easy mac"> <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> + <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> <select name="language" id="osx-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig" style="margin-bottom: 5px;"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> </form> <div class="desc"> @@ -113,7 +113,7 @@ <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> - <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> + <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> </div> </div>  @@ -134,7 +134,7 @@ <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD (64-Bit)</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> - <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip">Mac</a> or <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> + <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip">Mac</a> or <a class="win-alt64" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> </div> </div> <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p> Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-03-19 20:58:42 UTC (rev 25557) +++ website/trunk/download/en/download.wml 2012-03-20 02:03:30 UTC (rev 25558) @@ -12,8 +12,8 @@ # <define-tag button-win-tbb32>Tor Browser Bundle</define-tag> <define-tag button-win-tbb64>Currently Unused</define-tag> -<define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag> -<define-tag button-osx-tbb64>64-bit (Beta)</define-tag> +<define-tag button-osx-tbb32>Tor Browser Bundle</define-tag> +<define-tag button-osx-tbb64>64-bit</define-tag> <define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag> <define-tag button-lin-tbb64>64-bit (Beta)</define-tag> Modified: website/trunk/include/dlhead.wmi =================================================================== --- website/trunk/include/dlhead.wmi 2012-03-19 20:58:42 UTC (rev 25557) +++ website/trunk/include/dlhead.wmi 2012-03-20 02:03:30 UTC (rev 25558) @@ -58,8 +58,8 @@ var pkg = caller.attr('id'); var lang = caller.val(); var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; - var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-'+lang+'.zip'; - var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-'+lang+'.zip'; + var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-'+lang+'.zip'; + var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-'+lang+'.zip'; var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz'; var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz'; if(pkg == 'win-tbb'){

1 0

r25557: {website} fixed path to tbb osx (website/trunk/download/en)
by Runa Sandvik 20 Mar '12

20 Mar '12

Author: runa Date: 2012-03-19 20:58:42 +0000 (Mon, 19 Mar 2012) New Revision: 25557 Modified: website/trunk/download/en/download.wml Log: fixed path to tbb osx Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-03-19 17:30:26 UTC (rev 25556) +++ website/trunk/download/en/download.wml 2012-03-19 20:58:42 UTC (rev 25557) @@ -137,21 +137,21 @@ # <div class="package" style="padding-top: 13px; border-top: 0px;"> <form class="downloads"> - <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> + <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> <select name="language" id="osx-tbb" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> + <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> <select name="language" id="osx-tbb64" class="lang"> #include <lang.wmi> </select> <div class="sig"> <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> - (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a href="<page projects/torbrowser-details>#build">Source Code</a> </form>

1 0

[atlas/master] Correctly handle null values in bandwidth graphs.
by art＠torproject.org 20 Mar '12

20 Mar '12

commit 4b6a5f833e4c1ad6a93dab76396ccd35af044273 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 19 09:42:58 2012 +0100 Correctly handle null values in bandwidth graphs. Before 9816969, null values were handled as 0. With 9816969, null values were removed, but non-null values were connected with a line even with null values in between them. Now, null values are removed and lines are not connected. Fixes #1. --- js/models/graph.js | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/js/models/graph.js b/js/models/graph.js index a36bf9b..4d1f8ce 100644 --- a/js/models/graph.js +++ b/js/models/graph.js @@ -54,19 +54,20 @@ define([ _.each(history[period].values, function(value, i) { y += history[period].interval*1000; + var x = null if (value != null) { - var x = value*history[period].factor; - - // This is quite a hack to conform to backbone.js - // funky way of setting and getting attributes in - // models. - // XXX probably want to refactor. - var mperiod = period.split("_")[1] - var newar = model.get(mperiod).write; - newar.push([y,x]); - var toset = {mperiod: {write: newar}}; - model.set(toset); + x = value*history[period].factor; } + + // This is quite a hack to conform to backbone.js + // funky way of setting and getting attributes in + // models. + // XXX probably want to refactor. + var mperiod = period.split("_")[1] + var newar = model.get(mperiod).write; + newar.push([y,x]); + var toset = {mperiod: {write: newar}}; + model.set(toset); }); }); @@ -80,14 +81,15 @@ define([ var y = first.getTime(); _.each(history[period].values, function(value, i) { y += history[period].interval*1000; + var x = null if (value != null) { - var x = value*history[period].factor; - var mperiod = period.split("_")[1] - var newar = model.get(mperiod).read; - newar.push([y,x]); - var toset = {mperiod: {read: newar}}; - model.set(toset); + x = value*history[period].factor; } + var mperiod = period.split("_")[1] + var newar = model.get(mperiod).read; + newar.push([y,x]); + var toset = {mperiod: {read: newar}}; + model.set(toset); }); }); }

1 0

[atlas/master] Change hard-coded IP to onionoo.tpo.
by art＠torproject.org 20 Mar '12

20 Mar '12

commit 831c9328092490db97521ca97167424aa3081cf8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 19 09:14:51 2012 +0100 Change hard-coded IP to onionoo.tpo. --- js/collections/results.js | 2 +- js/models/graph.js | 2 +- js/models/relay.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/collections/results.js b/js/collections/results.js index 4b06e95..ad71cfc 100644 --- a/js/collections/results.js +++ b/js/collections/results.js @@ -7,7 +7,7 @@ define([ ], function($, _, Backbone, relayModel){ var resultsCollection = Backbone.Collection.extend({ model: relayModel, - baseurl: 'http://85.214.195.203/summary/search/', + baseurl: 'http://onionoo.torproject.org/summary/search/', url: '', lookup: function(options) { var success = options.success; diff --git a/js/models/graph.js b/js/models/graph.js index 86cb9ad..a36bf9b 100644 --- a/js/models/graph.js +++ b/js/models/graph.js @@ -6,7 +6,7 @@ define([ 'backbone' ], function($, _, Backbone){ var graphModel = Backbone.Model.extend({ - baseurl: 'http://85.214.195.203', + baseurl: 'http://onionoo.torproject.org', initialize: function() { this.set({ days: {write: [], read: []}, diff --git a/js/models/relay.js b/js/models/relay.js index a72d838..878a7ce 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -7,7 +7,7 @@ define([ ], function($, _, Backbone){ var relayModel = Backbone.Model.extend({ - baseurl: 'http://85.214.195.203', + baseurl: 'http://onionoo.torproject.org', fingerprint: '', parseflags: function(flags, size) { var output = [];

1 0

[obfsproxy/master] Trivial layout change in Changelog.
by asn＠torproject.org 20 Mar '12

20 Mar '12

commit d34089686511346da413f5fb35a86a3b2541b1ee Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 19 13:16:52 2012 -0700 Trivial layout change in Changelog. --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc055b5..f719d58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,5 +22,5 @@ Changes in version 0.1.1 - 2012-03-09 Changes in version 0.1.0 - 2012-03-05 - - Initial release. + - Initial release.

1 0

[obfsproxy/master] Implement 'make-version'.
by asn＠torproject.org 20 Mar '12

20 Mar '12

commit d8ef5b5cb200e633db146511033535d178b63659 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Feb 22 13:59:40 2012 -0800 Implement 'make-version'. --- Makefile.am | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index d39b18c..f7c9c11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,3 @@ - ACLOCAL_AMFLAGS = -I m4 WARNINGS = -Wall -Wwrite-strings -Werror AM_CPPFLAGS = -I. -I$(srcdir)/src @@ -93,3 +92,10 @@ tester.py: src/test/tester.py.in Makefile endif man_MANS = doc/obfsproxy.1 + +version: + @echo "obfsproxy @VERSION@" + @if test -d "$(top_srcdir)/.git" && test -x "`which git 2>&1;true`"; then \ + echo -n "git: " ;\ + (cd "$(top_srcdir)" && git rev-parse --short=16 HEAD); \ + fi

1 0

[obfsproxy/master] Implement --version and put git revision on top of log.
by asn＠torproject.org 20 Mar '12

20 Mar '12

commit 4f3d208352cada4bd3f31696e1d19f5061ed2692 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Mar 19 12:55:34 2012 -0700 Implement --version and put git revision on top of log. Also, implement --help. --- .gitignore | 1 + ChangeLog | 7 +++++++ Makefile.am | 27 ++++++++++++++++++++++++++- src/main.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 848c2b5..590ceed 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ Makefile.in /obfsproxy /unittests /tester.py +/micro-revision.i # /doc/ /doc/doxygen diff --git a/ChangeLog b/ChangeLog index 1bdab1a..fc055b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Changes in version 0.1.2 - <not yet released> + - Display git revision when we start logging. Fixes part of bug + #5157. + - Implement obfsproxy --version. Fixes the rest of bug #5157. + - Implement obfsproxy --help. + + Changes in version 0.1.1 - 2012-03-09 - Add trailing slash to the torproject URL in the man page. Fixes bug #5311. Patch by Peter Palfrader. diff --git a/Makefile.am b/Makefile.am index f7c9c11..6b2731f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,7 +54,8 @@ noinst_HEADERS = \ src/protocols/dummy.h \ src/protocols/obfs2.h \ src/test/tinytest.h \ - src/test/tinytest_macros.h + src/test/tinytest_macros.h \ + micro-revision.i EXTRA_DIST = \ ChangeLog \ @@ -99,3 +100,27 @@ version: echo -n "git: " ;\ (cd "$(top_srcdir)" && git rev-parse --short=16 HEAD); \ fi + +all: micro-revision.i + +micro-revision.i: FORCE + @rm -f micro-revision.tmp; \ + if test -d "$(top_srcdir)/.git" && \ + test -x "`which git 2>&1;true`"; then \ + HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \ + echo \"$$HASH\" > micro-revision.tmp; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true + @rm -f micro-revision.tmp; + +CLEANFILES = micro-revision.i + +#Dummy target to ensure that micro-revision.i _always_ gets built. +FORCE: diff --git a/src/main.c b/src/main.c index 0d690b7..30210f1 100644 --- a/src/main.c +++ b/src/main.c @@ -31,6 +31,16 @@ #include <event2/event.h> #include <event2/dns.h> +/** String describing which obfsproxy git repository version the + * source was built from. This string is generated by a bit of shell + * kludging in Makefile.am, and is usually right. + */ +const char obfs_git_revision[] = +#ifndef _MSC_VER +#include "micro-revision.i" +#endif + ""; + static struct event_base *the_event_base; static struct event *sig_int; static struct event *sig_term; @@ -41,6 +51,22 @@ static int is_external_proxy=1; /* Whether to scrub connection addresses -- on by default */ int safe_logging=1; +static char *the_obfsproxy_version = NULL; + +/** Return the current obfsproxy version. */ +static const char * +get_version(void) +{ + if (!the_obfsproxy_version) { + if (strlen(obfs_git_revision)) + obfs_asprintf(&the_obfsproxy_version, "git-%s", obfs_git_revision); + else + obfs_asprintf(&the_obfsproxy_version, "git"); + } + + return the_obfsproxy_version; +} + /** Prints the obfsproxy usage instructions then exits. */ @@ -61,6 +87,21 @@ usage(void) "--no-log ~ disable logging\n" "--no-safe-logging ~ disable safe (scrubbed address) logging\n"); + if (the_obfsproxy_version) + free(the_obfsproxy_version); + + exit(1); +} + +/** Prints the obfsproxy version then exits. */ +static void ATTR_NORETURN +version(void) +{ + printf("obfsproxy %s\n", get_version()); + + if (the_obfsproxy_version) + free(the_obfsproxy_version); + exit(1); } @@ -175,6 +216,10 @@ handle_obfsproxy_args(const char *const *argv) safe_logging=0; } else if (!strncmp(argv[i], "--managed", 10)) { is_external_proxy=0; + } else if (!strncmp(argv[i], "--version", 10)) { + version(); + } else if (!strncmp(argv[i], "--help", 7)) { + usage(); } else { log_error("Unrecognizable obfsproxy argument '%s'", argv[i]); } @@ -279,8 +324,10 @@ obfsproxy_cleanup() cleanup_crypto(); status_connections_cleanup(); close_obfsproxy_logfile(); -} + if (the_obfsproxy_version) + free(the_obfsproxy_version); +} /** Entry point */ int @@ -290,7 +337,7 @@ obfs_main(int argc, const char *const *argv) /* Handle optional obfsproxy arguments. */ begin = argv + handle_obfsproxy_args(argv); - log_notice("Starting."); + log_notice("Starting (%s).", get_version()); if (is_external_proxy) { if (launch_external_proxy(begin) < 0)

1 0

[obfsproxy/master] obfsproxify tor_asprintf() and friends
by asn＠torproject.org 20 Mar '12

20 Mar '12

commit dfbe3e36a516191a18fd55540d88dee344181ac4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Feb 22 11:39:55 2012 -0800 obfsproxify tor_asprintf() and friends s/tor_snprintf/obfs_snprintf/g s/tor_vasprintf/obfs_vasprintf/g s/tor_asprintf/obfs_asprintf/g s/tor_strdup/xstrdup/g s/tor_free/free/g s/tor_malloc/xmalloc/ Also, change 'log_err(); tor_assert()' to 'log_error()'. Also, add prototypes for the functions. --- src/util.c | 29 ++++++++++++++--------------- src/util.h | 3 +++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/util.c b/src/util.c index 1d78f1f..5c524b5 100644 --- a/src/util.c +++ b/src/util.c @@ -351,35 +351,34 @@ ascii_strlower(char *s) * You can treat this function as if its implementation were something like <pre> char buf[_INFINITY_]; - tor_snprintf(buf, sizeof(buf), fmt, args); - *strp = tor_strdup(buf); + obfs_snprintf(buf, sizeof(buf), fmt, args); + *strp = xstrdup(buf); return strlen(*strp): </pre> * Where _INFINITY_ is an imaginary constant so big that any string can fit * into it. */ int -tor_asprintf(char **strp, const char *fmt, ...) +obfs_asprintf(char **strp, const char *fmt, ...) { int r; va_list args; va_start(args, fmt); - r = tor_vasprintf(strp, fmt, args); + r = obfs_vasprintf(strp, fmt, args); va_end(args); - if (!*strp || r < 0) { - log_err(LD_BUG, "Internal error in asprintf"); - tor_assert(0); - } + if (!*strp || r < 0) + log_error("Internal error in asprintf"); + return r; } /** * Portable vasprintf implementation. Does a printf() into a newly malloc'd * string. Differs from regular vasprintf in the same ways that - * tor_asprintf() differs from regular asprintf. + * obfs_asprintf() differs from regular asprintf. */ int -tor_vasprintf(char **strp, const char *fmt, va_list args) +obfs_vasprintf(char **strp, const char *fmt, va_list args) { /* use a temporary variable in case *strp is in args. */ char *strp_tmp=NULL; @@ -401,10 +400,10 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) *strp = NULL; return -1; } - strp_tmp = tor_malloc(len + 1); + strp_tmp = xmalloc(len + 1); r = _vsnprintf(strp_tmp, len+1, fmt, args); if (r != len) { - tor_free(strp_tmp); + free(strp_tmp); *strp = NULL; return -1; } @@ -422,13 +421,13 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) len = vsnprintf(buf, sizeof(buf), fmt, tmp_args); va_end(tmp_args); if (len < (int)sizeof(buf)) { - *strp = tor_strdup(buf); + *strp = xstrdup(buf); return len; } - strp_tmp = tor_malloc(len+1); + strp_tmp = xmalloc(len+1); r = vsnprintf(strp_tmp, len+1, fmt, args); if (r != len) { - tor_free(strp_tmp); + free(strp_tmp); *strp = NULL; return -1; } diff --git a/src/util.h b/src/util.h index f8dfc7e..d879eba 100644 --- a/src/util.h +++ b/src/util.h @@ -138,6 +138,9 @@ int obfs_snprintf(char *str, size_t size, const char *format, ...) ATTR_PRINTF_3; +int obfs_asprintf(char **strp, const char *fmt, ...); +int obfs_vasprintf(char **strp, const char *fmt, va_list args); + /***** Logging. *****/ /** Log destinations */

1 0

[obfsproxy/master] Add obfs_asprintf() unit tests.
by asn＠torproject.org 20 Mar '12

20 Mar '12

commit 48c54ccec2ab50407fd4ee40f618c90ff23e4c1f Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Feb 22 12:21:49 2012 -0800 Add obfs_asprintf() unit tests. Take tor_asprintf() unit tests off tor.git:src/tests/test_util.c:test_util_asprintf(). Replace 'tor_asprintf' with 'obfs_asprintf', and 'tor_free(x);' with 'free(x); x=NULL;'. --- Makefile.am | 3 +- src/test/unittest.c | 2 + src/test/unittest_util.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index a703a99..a230b95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,8 @@ unittests_SOURCES = \ src/test/unittest_socks.c \ src/test/unittest_dummy.c \ src/test/unittest_managed.c \ - src/test/unittest_obfs2.c + src/test/unittest_obfs2.c \ + src/test/unittest_util.c noinst_HEADERS = \ src/container.h \ diff --git a/src/test/unittest.c b/src/test/unittest.c index 26d5566..f871924 100644 --- a/src/test/unittest.c +++ b/src/test/unittest.c @@ -11,6 +11,7 @@ extern struct testcase_t socks_tests[]; extern struct testcase_t dummy_tests[]; extern struct testcase_t obfs2_tests[]; extern struct testcase_t managed_tests[]; +extern struct testcase_t util_tests[]; struct testgroup_t groups[] = { { "container/", container_tests }, @@ -19,6 +20,7 @@ struct testgroup_t groups[] = { { "dummy/", dummy_tests }, { "obfs2/", obfs2_tests }, { "managed/", managed_tests }, + { "util/", util_tests }, END_OF_GROUPS }; diff --git a/src/test/unittest_util.c b/src/test/unittest_util.c new file mode 100644 index 0000000..8aafa58 --- /dev/null +++ b/src/test/unittest_util.c @@ -0,0 +1,59 @@ +/* Copyright 2011 Nick Mathewson, George Kadianakis + See LICENSE for other credits and copying information +*/ + +#include "util.h" +#include "protocol.h" +#include "tinytest_macros.h" + +static void +test_util_asprintf(void *unused) +{ +#define LOREMIPSUM \ + "Lorem ipsum dolor sit amet, consectetur adipisicing elit" + char *cp=NULL, *cp2=NULL; + int r; + + /* empty string. */ + r = obfs_asprintf(&cp, "%s", ""); + tt_assert(cp); + tt_int_op(r, ==, strlen(cp)); + tt_str_op(cp, ==, ""); + + /* Short string with some printing in it. */ + r = obfs_asprintf(&cp2, "First=%d, Second=%d", 101, 202); + tt_assert(cp2); + tt_int_op(r, ==, strlen(cp2)); + tt_str_op(cp2, ==, "First=101, Second=202"); + tt_assert(cp != cp2); + free(cp); cp = NULL; + free(cp2); cp2 = NULL; + + /* Glass-box test: a string exactly 128 characters long. */ + r = obfs_asprintf(&cp, "Lorem1: %sLorem2: %s", LOREMIPSUM, LOREMIPSUM); + tt_assert(cp); + tt_int_op(r, ==, 128); + tt_assert(cp[128] == '\0'); + tt_str_op(cp, ==, + "Lorem1: "LOREMIPSUM"Lorem2: "LOREMIPSUM); + free(cp); cp = NULL; + + /* String longer than 128 characters */ + r = obfs_asprintf(&cp, "1: %s 2: %s 3: %s", + LOREMIPSUM, LOREMIPSUM, LOREMIPSUM); + tt_assert(cp); + tt_int_op(r, ==, strlen(cp)); + tt_str_op(cp, ==, "1: "LOREMIPSUM" 2: "LOREMIPSUM" 3: "LOREMIPSUM); + + end: + free(cp); + free(cp2); +} + +#define T(name) \ + { #name, test_util_##name, 0, NULL, NULL } + +struct testcase_t util_tests[] = { + T(asprintf), + END_OF_TESTCASES +};

1 0