February 2014 - tor-commits - lists.torproject.org

r26601: {website} fix the .dbox class so users can edit the donation number. ( (website/trunk/css)
by Roger Dingledine 10 Feb '14

10 Feb '14

Author: arma Date: 2014-02-10 19:54:43 +0000 (Mon, 10 Feb 2014) New Revision: 26601 Modified: website/trunk/css/layout.css Log: fix the .dbox class so users can edit the donation number. (currently the "Donate to Tor" text covers the box with the number 5 in it, so they can't click on it to change it.) Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2014-02-10 18:54:07 UTC (rev 26600) +++ website/trunk/css/layout.css 2014-02-10 19:54:43 UTC (rev 26601) @@ -980,6 +980,7 @@ padding: 1.4em 0.7em; width: 163px; margin: 0px 0px 0px 10px; + z-index:-10; } .dbox p {

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 10 Feb '14

10 Feb '14

commit fe0967c4fb5b87726574fea5eaa98f029898436d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 10 19:45:13 2014 +0000 Update translations for torcheck_completed --- de/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 292912f..e9fcbb2 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -4,13 +4,14 @@ # Translators: # LaKoon <lakoon(a)posteo.org>, 2011 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 +# Zweimaldhaelfti <sacha.bissig(a)windowslive.com>, 2014 # to_ba, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-02 16:50+0000\n" -"Last-Translator: to_ba\n" +"PO-Revision-Date: 2014-02-10 19:42+0000\n" +"Last-Translator: Zweimaldhaelfti <sacha.bissig(a)windowslive.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -69,7 +70,7 @@ msgstr "Für mehr Infos über diesen Exit-Knoten, siehe:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "Die Organisation \"The Tor Project\" ist nach dem US-Gesetz US 501(c)(3) als gemeinnützig eingestuft und widmet sich Forchung, Entwicklung und Schulung von Anonymität und Datenschutz." +msgstr "\"The Tor Project\" wird nach dem US-Gesetz US 501(c)(3) eine gemeinnützig Organisation und widmet sich der Erforschung, Entwicklung und Schulung von Anonymität und Datenschutz." msgid "Learn More »" msgstr "Mehr erfahren »"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 10 Feb '14

10 Feb '14

commit 4e0dce6d310e4a9bf60b46441eb379a7aa9c4d60 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 10 19:45:10 2014 +0000 Update translations for torcheck --- de/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po b/de/torcheck.po index 292912f..e9fcbb2 100644 --- a/de/torcheck.po +++ b/de/torcheck.po @@ -4,13 +4,14 @@ # Translators: # LaKoon <lakoon(a)posteo.org>, 2011 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 +# Zweimaldhaelfti <sacha.bissig(a)windowslive.com>, 2014 # to_ba, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-02 16:50+0000\n" -"Last-Translator: to_ba\n" +"PO-Revision-Date: 2014-02-10 19:42+0000\n" +"Last-Translator: Zweimaldhaelfti <sacha.bissig(a)windowslive.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -69,7 +70,7 @@ msgstr "Für mehr Infos über diesen Exit-Knoten, siehe:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "Die Organisation \"The Tor Project\" ist nach dem US-Gesetz US 501(c)(3) als gemeinnützig eingestuft und widmet sich Forchung, Entwicklung und Schulung von Anonymität und Datenschutz." +msgstr "\"The Tor Project\" wird nach dem US-Gesetz US 501(c)(3) eine gemeinnützig Organisation und widmet sich der Erforschung, Entwicklung und Schulung von Anonymität und Datenschutz." msgid "Learn More »" msgstr "Mehr erfahren »"

1 0

r26600: {website} Bump TBB version (website/trunk/include)
by Mike Perry 10 Feb '14

10 Feb '14

Author: mikeperry Date: 2014-02-10 18:54:07 +0000 (Mon, 10 Feb 2014) New Revision: 26600 Modified: website/trunk/include/versions.wmi Log: Bump TBB version Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-02-10 07:19:06 UTC (rev 26599) +++ website/trunk/include/versions.wmi 2014-02-10 18:54:07 UTC (rev 26600) @@ -23,9 +23,9 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>3.5.1</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>3.5.2</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>3.5.1</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>3.5.2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -37,8 +37,8 @@ <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.18-rc-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.18-rc-1-pt1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.5.1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.5.1</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.5.2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.5.2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -49,7 +49,7 @@ <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.18-rc-1-pt1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.18-rc-2-pt1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>3.5.1</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>3.5.2</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag>

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 10 Feb '14

10 Feb '14

commit 589a9b28944d45211f56dbebd8576f4dc32464a1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 10 15:45:20 2014 +0000 Update translations for liveusb-creator --- tr/tr.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index fb8eeee..cc57232 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -4,6 +4,7 @@ # # Translators: # Bloodia <aycaom(a)hotmail.com>, 2013 +# mrtmsy <mertamasya(a)gmail.com>, 2014 # muaz742, 2013 # volkangezer <volkangezer(a)gmail.com>, 2013-2014 # yozel <iletisim(a)yasinozel.com.tr>, 2013 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 11:27+0100\n" -"PO-Revision-Date: 2014-01-11 09:25+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-01-29 14:16+0100\n" +"PO-Revision-Date: 2014-02-10 15:41+0000\n" +"Last-Translator: mrtmsy <mertamasya(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -181,7 +182,7 @@ msgstr "Hata: Live CD'nizin SHA1'i geçersizdir. Bu programı --noverify argüma #: ../liveusb/creator.py:145 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "Hedef cihaza canlı resim çıkartılıyor..." #: ../liveusb/creator.py:1063 #, python-format @@ -282,7 +283,7 @@ msgstr "Kalici Depo (0 MB)" #: ../liveusb/gui.py:702 ../liveusb/gui.py:731 msgid "Please confirm your device selection" -msgstr "" +msgstr "Lütfen cihaz seçiminizi onaylayın." #: ../liveusb/gui.py:467 msgid "Refreshing releases..." @@ -386,7 +387,7 @@ msgstr "Bu, tüm iletilerin yazılacağı durum konsoludur" #: ../liveusb/creator.py:879 msgid "Trying to continue anyway." -msgstr "" +msgstr "Yine de devam edilmeye çalışılıyor" #: ../liveusb/creator.py:911 #, python-format @@ -409,7 +410,7 @@ msgstr "Herhangi bir USB sürücü bulunamadı" #: ../liveusb/creator.py:1200 msgid "Unable to find any supported device" -msgstr "" +msgstr "Desteklenen herhangi bir cihaz bulunamadı." #: ../liveusb/creator.py:1040 msgid "Unable to find partition" @@ -486,7 +487,7 @@ msgstr " '%(device)s' deki takılı dosya sistemleri çıkarılıyor." #: ../liveusb/creator.py:876 #, python-format msgid "Unsupported device '%(device)s', please report a bug." -msgstr "" +msgstr "Desteklenemeyen cihaz '%(device)s', lütfen bu hatayı rapor ediniz." #: ../liveusb/creator.py:770 ../liveusb/creator.py:893 #, python-format

1 0

r26599: {website} Added 6 FAQ entries from the wiki. (website/trunk/docs/en)
by Matt Pagan 10 Feb '14

10 Feb '14

Author: mttp Date: 2014-02-10 07:19:06 +0000 (Mon, 10 Feb 2014) New Revision: 26599 Modified: website/trunk/docs/en/faq.wml Log: Added 6 FAQ entries from the wiki. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-02-10 02:51:35 UTC (rev 26598) +++ website/trunk/docs/en/faq.wml 2014-02-10 07:19:06 UTC (rev 26599) @@ -173,7 +173,12 @@ limiting bandwidth on my Tor relay?</a></li> <li><a href="#ExitPolicies">I'd run a relay, but I don't want to deal with abuse issues.</a></li> - <li><a href="#DifferentComputer">I want to run my Tor client on a + <li><a href="#WhatIsTheBadExitFlag">What is the BadExit flag?</a></li> + <li><a href="#IGotTheBadExitFlagWhyDidThatHappen">I got the BadExit flag. + Why did that happen?</a></li> + <li><a href="#MyRelayRecentlyGotTheGuardFlagAndTrafficDroppedByHalf">My + relay recently got the Guard flag and traffic dropped by half.</a></li> + <li><a href="#TorClientOnADifferentComputerThanMyApplications">I want to run my Tor client on a different computer than my applications.</a></li> <li><a href="#ServerClient">Can I install Tor on a central server, and have my clients connect to it?</a></li> @@ -195,6 +200,8 @@ </a></li> <li><a href="#BetterAnonymity">Do I get better anonymity if I run a relay? </a></li> + <li><a href="#FacingLegalTrouble">I'm facing legal trouble. How do I + prove that my server was a Tor relay at a given time?</a></li> <li><a href="#RelayDonations">Can I donate for a relay rather than run my own?</a></li> </ul> @@ -242,11 +249,13 @@ </a></li> <li><a href="#RemotePhysicalDeviceFingerprinting">Does Tor resist "remote physical device fingerprinting"?</a></li> - <li><a href="#VPN">Is Tor like a VPN?</a></li> + <li><a href="#IsTorLikeAVPN">Is Tor like a VPN?</a></li> + <li><a href="#ShouldIUseTorWithAVPN">Should I use Tor with a VPN?</a></li> <li><a href="#Proxychains">Aren't 10 proxies (proxychains) better than Tor with only 3 hops?</a></li> <li><a href="#AttacksOnOnionRouting">What attacks remain against onion routing?</a></li> + <li><a href="#LearnMoreAboutAnonymity">Where can I learn more about anonymity?</a></li> </ul> <p><a href="#AlternateDesigns">Alternate designs that we don't do (yet):</a></p> @@ -2818,10 +2827,50 @@ <hr> - <a id="DifferentComputer"></a> - <h3><a class="anchor" href="#DifferentComputer">I want to run my - Tor client on a different computer than my applications.</a></h3> + <a id="WhatIsTheBadExitFlag"></a> + <h3><a class="anchor" href="#WhatIsTheBadExitFlag">What is the + BadExit flag?</a></h3> + + <p>When an exit is misconfigured or malicious it's assigned the BadExit + flag. This tells Tor to avoid exiting through that relay. In effect, + relays with this flag become non-exits.</p> + + <hr> + + <a id="IGotTheBadExitFlagWhyDidThatHappen"></a> + <h3><a class="anchor" href="#IGotTheBadExitFlagWhyDidThatHappen">I got + the BadExit flag why did that happen?</a></h3> + + <p>If you got this flag then we either discovered a problem or suspicious + activity coming from your exit and weren't able to contact you. The reason + for most flaggings are documented on the <a + href="https://trac.torproject.org/projects/tor/wiki/doc/badRelays">bad + relays wiki</a>. Please <a + href="https://torproject.org/about/contact.html.en">contact us</a> so + we can sort out the issue.</p> + + <hr> + + <a id="MyRelayRecentlyGotTheGuardFlagAndTrafficDroppedByHalf"></a> + <h3><a class="anchor" href="#MyRelayRecentlyGotTheGuardFlagAndTrafficDroppedByHalf">My + relay recently got the Guard flag and traffic dropped by half.</a></h3> <p> + Since it's now a guard, clients are using it less in other positions, but + not many clients have rotated their existing guards out to use it as a + guard yet. Read more details in this <a + href="https://blog.torproject.org/blog/lifecycle-of-a-new-relay">blog + post</a> or in <a href="http://freehaven.net/anonbib/#wpes12-cogs">Changing + of the Guards: A Framework for Understanding and Improving Entry Guard + Selection in Tor</a>. + </p> + + <hr> + + <a id="TorClientOnADifferentComputerThanMyApplications"></a> + <h3><a class="anchor" href="#TorClientOnADifferentComputerThanMyApplications">I + want to run my Tor client on a different computer than my applications. + </a></h3> + <p> By default, your Tor client only listens for applications that connect from localhost. Connections from other computers are refused. If you want to torify applications on different computers @@ -3382,6 +3431,19 @@ <hr> + <a id="FacingLegalTrouble"></a> + <h3><a class="anchor" href="#FacingLegalTrouble">I'm facing legal + trouble. How do I prove that my server was a Tor relay at a given + time?</a></h3> + + <p><a href="https://exonerator.torproject.org/"> + Exonerator</a> is a web service that can check if an IP address was a + relay at a given time. We can also <a + href="https://torproject.org/about/contact.html.en">provide a signed + letter</a> if needed.</p> + + <hr> + <a id="RelayDonations"></a> <h3><a class="anchor" href="#RelayDonations">Can I donate for a relay rather than run my own?</a></h3> @@ -4183,8 +4245,8 @@ <hr> - <a id="VPN"></a> - <h3><a class="anchor" href="#VPN">Is Tor like a VPN?</a></h3> + <a id="IsTorLikeAVPN"></a> + <h3><a class="anchor" href="#IsTorLikeAVPN">Is Tor like a VPN?</a></h3> <p> Some people use Virtual Private Networks (VPNs) as a privacy solution. @@ -4221,9 +4283,23 @@ href="https://www.torproject.org/about/overview.html.en#thesolution">encrypted three-hop circuit</a> design. </p> - + <hr> + <a id="ShouldIUseTorWithAVPN"></a> + <h3><a class="anchor" href="#ShouldIUseTorWithAVPN">Should I use Tor + with a VPN?</a></h3> + + <p> + This <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN">wiki + page</a> discusses costs and benefits. However, if you're looking + for a trusted entry into the Tor network, <a + href="https://www.torproject.org/docs/bridges#RunningABridge">setting up + a private Tor server as a bridge</a> is a great option. + </p> + + <hr> + <a id="Proxychains"></a> <h3><a class="anchor" href="#Proxychains">Aren't 10 proxies (proxychains) better than Tor with only 3 hops?</a></h3> @@ -4281,7 +4357,16 @@ <hr> + <a id="LearnMoreAboutAnonymity"></a> + <h3><a class="anchor" href="#LearnMoreAboutAnonymity">Where can I + learn more about anonymity?</a></h3> + <p> + <a href="http://freehaven.net/anonbib/topic.html#Anonymous_20communication">Read these papers</a> (especially the ones in boxes) to get up to speed on anonymous communication systems. + </p> + + <hr> + <a id="AlternateDesigns"></a> <h2><a class="anchor">Alternate designs:</a></h2>

1 0

r26598: {website} Updating GSoC page for 2014 Actually, there's really little (website/trunk/about/en)
by Damian Johnson 10 Feb '14

10 Feb '14

Author: atagar Date: 2014-02-10 02:51:35 +0000 (Mon, 10 Feb 2014) New Revision: 26598 Modified: website/trunk/about/en/gsoc.wml Log: Updating GSoC page for 2014 Actually, there's really little to change. Took a read through but besides the header it looks good. Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2014-02-09 02:55:13 UTC (rev 26597) +++ website/trunk/about/en/gsoc.wml 2014-02-10 02:51:35 UTC (rev 26598) @@ -2,23 +2,26 @@ # Revision: $Revision$ # Translation-Priority: 4-optional -#include "head.wmi" TITLE="Tor: Google Summer of Code 2013" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor: Google Summer of Code 2014" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page about/gsoc>">Google Summer of Code</a> </div> <div id="maincol"> - <h2>Tor: Google Summer of Code 2013</h2> + <h2>Tor: Google Summer of Code 2014</h2> <hr> <p> The Tor Project, in collaboration with <a href="https://www.eff.org/">The Electronic Frontier Foundation</a>, have taken part in Google Summer of Code - for 2007 through 2012, mentoring the total of 33 students. Now google has + for 2007 through 2013, mentoring the total of 40 students. +  </p> <p>

1 0

[tor/master] Make sure orconn->chan gets nulled out when channels exit from channel_free_all() too
by nickm＠torproject.org 10 Feb '14

10 Feb '14

commit c330d63ff7614b2382dfa0e84da0b40ed6348ced Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Feb 8 14:05:51 2014 -0800 Make sure orconn->chan gets nulled out when channels exit from channel_free_all() too --- src/or/channeltls.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 495f856..d5428c1 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -53,6 +53,7 @@ static void channel_tls_common_init(channel_tls_t *tlschan); static void channel_tls_close_method(channel_t *chan); static const char * channel_tls_describe_transport_method(channel_t *chan); +static void channel_tls_free_method(channel_t *chan); static int channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out); static const char * @@ -112,6 +113,7 @@ channel_tls_common_init(channel_tls_t *tlschan) chan->state = CHANNEL_STATE_OPENING; chan->close = channel_tls_close_method; chan->describe_transport = channel_tls_describe_transport_method; + chan->free = channel_tls_free_method; chan->get_remote_addr = channel_tls_get_remote_addr_method; chan->get_remote_descr = channel_tls_get_remote_descr_method; chan->has_queued_writes = channel_tls_has_queued_writes_method; @@ -384,6 +386,30 @@ channel_tls_describe_transport_method(channel_t *chan) } /** + * Free a channel_tls_t + * + * This is called by the generic channel layer when freeing a channel_tls_t; + * this happens either on a channel which has already reached + * CHANNEL_STATE_CLOSED or CHANNEL_STATE_ERROR from channel_run_cleanup() or + * on shutdown from channel_free_all(). In the latter case we might still + * have an orconn active (which connection_free_all() will get to later), + * so we should null out its channel pointer now. + */ + +static void +channel_tls_free_method(channel_t *chan) +{ + channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); + + tor_assert(tlschan); + + if (tlschan->conn) { + tlschan->conn->chan = NULL; + tlschan->conn = NULL; + } +} + +/** * Get the remote address of a channel_tls_t * * This implements the get_remote_addr method for channel_tls_t; copy the

1 0

[tor/master] Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4
by nickm＠torproject.org 10 Feb '14

10 Feb '14

commit 7f6aa780e3183f34b2fa771e17813018e6b28115 Merge: 9bb34aa c330d63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 9 21:41:24 2014 -0500 Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4 src/or/channeltls.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 10 Feb '14

10 Feb '14

commit a73b0da653db051275311ea791098a8a9dacc98f Merge: a0577aa 7f6aa78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 9 21:41:59 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' src/or/channeltls.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --cc src/or/channeltls.c index 42d6874,d5428c1..959ec47 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@@ -53,10 -53,9 +53,11 @@@ static void channel_tls_common_init(cha static void channel_tls_close_method(channel_t *chan); static const char * channel_tls_describe_transport_method(channel_t *chan); + static void channel_tls_free_method(channel_t *chan); static int channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out); +static int +channel_tls_get_transport_name_method(channel_t *chan, char **transport_out); static const char * channel_tls_get_remote_descr_method(channel_t *chan, int flags); static int channel_tls_has_queued_writes_method(channel_t *chan); @@@ -114,9 -113,9 +115,10 @@@ channel_tls_common_init(channel_tls_t * chan->state = CHANNEL_STATE_OPENING; chan->close = channel_tls_close_method; chan->describe_transport = channel_tls_describe_transport_method; + chan->free = channel_tls_free_method; chan->get_remote_addr = channel_tls_get_remote_addr_method; chan->get_remote_descr = channel_tls_get_remote_descr_method; + chan->get_transport_name = channel_tls_get_transport_name_method; chan->has_queued_writes = channel_tls_has_queued_writes_method; chan->is_canonical = channel_tls_is_canonical_method; chan->matches_extend_info = channel_tls_matches_extend_info_method;

1 0