October 2012 - tor-commits - lists.torproject.org

[tor/master] Try refactoring channel list to use HT_ and LIST_ stuff directly
by andrea＠torproject.org 30 Oct '12

30 Oct '12

commit 2b10e99eb093e1e5e699db355e0c54342fa693b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 12 20:16:43 2012 -0400 Try refactoring channel list to use HT_ and LIST_ stuff directly --- src/or/channel.c | 191 +++++++++++++++++++++--------------------------------- src/or/channel.h | 4 +- 2 files changed, 75 insertions(+), 120 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index b594d05..7f3c6f5 100644 --- a/src/or/channel.c +++ b/src/or/channel.… [View More]c @@ -81,7 +81,37 @@ static uint64_t n_channels_allocated = 0; * If more than one channel exists, follow the next_with_same_id pointer * as a linked list. */ -static digestmap_t *channel_identity_map = NULL; +HT_HEAD(channel_idmap, channel_idmap_entry_s) channel_identity_map = + HT_INITIALIZER(); + +typedef struct channel_idmap_entry_s { + HT_ENTRY(channel_idmap_entry_s) node; + uint8_t digest[DIGEST_LEN]; + LIST_HEAD(channel_list_s, channel_s) channel_list; +} channel_idmap_entry_t; + +static INLINE unsigned +channel_idmap_hash(const channel_idmap_entry_t *ent) +{ + const unsigned *a = (const unsigned *)ent->digest; +#if SIZEOF_INT == 4 + return a[0] ^ a[1] ^ a[2] ^ a[3] ^ a[4]; +#elif SIZEOF_INT == 8 + return a[0] ^ a[1]; +#endif +} + +static INLINE int +channel_idmap_eq(const channel_idmap_entry_t *a, + const channel_idmap_entry_t *b) +{ + return tor_memeq(a->digest, b->digest, DIGEST_LEN); +} + +HT_PROTOTYPE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, + channel_idmap_eq); +HT_GENERATE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, + channel_idmap_eq, 0.5, tor_malloc, tor_realloc, _tor_free); static cell_queue_entry_t * cell_queue_entry_dup(cell_queue_entry_t *q); static void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off); @@ -505,7 +535,7 @@ channel_listener_unregister(channel_listener_t *chan_l) static void channel_add_to_digest_map(channel_t *chan) { - channel_t *tmp; + channel_idmap_entry_t *ent, search; tor_assert(chan); @@ -517,23 +547,15 @@ channel_add_to_digest_map(channel_t *chan) /* Assert that there is a digest */ tor_assert(!tor_digest_is_zero(chan->identity_digest)); - /* Allocate the identity map if we have to */ - if (!channel_identity_map) channel_identity_map = digestmap_new(); - - /* Insert it */ - tmp = digestmap_set(channel_identity_map, - chan->identity_digest, - chan); - if (tmp) { - /* There already was one, this goes at the head of the list */ - chan->next_with_same_id = tmp; - chan->prev_with_same_id = NULL; - tmp->prev_with_same_id = chan; - } else { - /* First with this digest */ - chan->next_with_same_id = NULL; - chan->prev_with_same_id = NULL; + memcpy(search.digest, chan->identity_digest, DIGEST_LEN); + ent = HT_FIND(channel_idmap, &channel_identity_map, &search); + if (! ent) { + ent = tor_malloc(sizeof(channel_idmap_entry_t)); + memcpy(ent->digest, chan->identity_digest, DIGEST_LEN); + LIST_INIT(&ent->channel_list); + HT_INSERT(channel_idmap, &channel_identity_map, ent); } + LIST_INSERT_HEAD(&ent->channel_list, chan, next_with_same_id); log_debug(LD_CHANNEL, "Added channel %p (global ID " U64_FORMAT ") " @@ -553,13 +575,14 @@ channel_add_to_digest_map(channel_t *chan) static void channel_remove_from_digest_map(channel_t *chan) { - channel_t *tmp; + channel_idmap_entry_t *ent, search; tor_assert(chan); /* Assert that there is a digest */ tor_assert(!tor_digest_is_zero(chan->identity_digest)); +#if 0 /* Make sure we have a map */ if (!channel_identity_map) { /* @@ -584,66 +607,29 @@ channel_remove_from_digest_map(channel_t *chan) return; } +#endif - /* Look for it in the map */ - tmp = digestmap_get(channel_identity_map, chan->identity_digest); - if (tmp) { - /* Okay, it's here */ - /* Look for this channel */ - while (tmp && tmp != chan) { - tmp = tmp->next_with_same_id; - } + /* Pull it out of its list, wherever that list is */ + LIST_REMOVE(chan, next_with_same_id); - if (tmp == chan) { - /* Found it, good */ - if (chan->next_with_same_id) { - chan->next_with_same_id->prev_with_same_id = chan->prev_with_same_id; - } - /* else we're the tail of the list */ - if (chan->prev_with_same_id) { - /* We're not the head of the list, so we can *just* unlink */ - chan->prev_with_same_id->next_with_same_id = chan->next_with_same_id; - } else { - /* We're the head, so we have to point the digest map entry at our - * next if we have one, or remove it if we're also the tail */ - if (chan->next_with_same_id) { - digestmap_set(channel_identity_map, - chan->identity_digest, - chan->next_with_same_id); - } else { - digestmap_remove(channel_identity_map, - chan->identity_digest); - } - } + memcpy(search.digest, chan->identity_digest, DIGEST_LEN); + ent = HT_FIND(channel_idmap, &channel_identity_map, &search); - /* NULL out its next/prev pointers, and we're finished */ - chan->next_with_same_id = NULL; - chan->prev_with_same_id = NULL; + /* Look for it in the map */ + if (ent) { + /* Okay, it's here */ - log_debug(LD_CHANNEL, - "Removed channel %p (global ID " U64_FORMAT ") from " - "identity map in state %s (%d) with digest %s", - chan, U64_PRINTF_ARG(chan->global_identifier), - channel_state_to_string(chan->state), chan->state, - hex_str(chan->identity_digest, DIGEST_LEN)); - } else { - /* This is not good */ - log_warn(LD_BUG, - "Trying to remove channel %p (global ID " U64_FORMAT ") " - "with digest %s from identity map, but couldn't find it in " - "the list for that digest", - chan, U64_PRINTF_ARG(chan->global_identifier), - hex_str(chan->identity_digest, DIGEST_LEN)); - /* Unlink it and hope for the best */ - if (chan->next_with_same_id) { - chan->next_with_same_id->prev_with_same_id = chan->prev_with_same_id; - } - if (chan->prev_with_same_id) { - chan->prev_with_same_id->next_with_same_id = chan->next_with_same_id; - } - chan->next_with_same_id = NULL; - chan->prev_with_same_id = NULL; + if (LIST_EMPTY(&ent->channel_list)) { + HT_REMOVE(channel_idmap, &channel_identity_map, ent); + tor_free(ent); } + + log_debug(LD_CHANNEL, + "Removed channel %p (global ID " U64_FORMAT ") from " + "identity map in state %s (%d) with digest %s", + chan, U64_PRINTF_ARG(chan->global_identifier), + channel_state_to_string(chan->state), chan->state, + hex_str(chan->identity_digest, DIGEST_LEN)); } else { /* Shouldn't happen */ log_warn(LD_BUG, @@ -652,15 +638,6 @@ channel_remove_from_digest_map(channel_t *chan) "that digest", chan, U64_PRINTF_ARG(chan->global_identifier), hex_str(chan->identity_digest, DIGEST_LEN)); - /* Clear out its next/prev pointers */ - if (chan->next_with_same_id) { - chan->next_with_same_id->prev_with_same_id = chan->prev_with_same_id; - } - if (chan->prev_with_same_id) { - chan->prev_with_same_id->next_with_same_id = chan->next_with_same_id; - } - chan->next_with_same_id = NULL; - chan->prev_with_same_id = NULL; } } @@ -698,20 +675,21 @@ channel_find_by_global_id(uint64_t global_identifier) * * This function looks up a channel by the digest of its remote endpoint in * the channel digest map. It's possible that more than one channel to a - * given endpoint exists. Use channel_next_with_digest() and - * channel_prev_with_digest() to walk the list. + * given endpoint exists. Use channel_next_with_digest() to walk the list. */ channel_t * channel_find_by_remote_digest(const char *identity_digest) { channel_t *rv = NULL; + channel_idmap_entry_t *ent, search; tor_assert(identity_digest); - /* Search for it in the identity map */ - if (channel_identity_map) { - rv = digestmap_get(channel_identity_map, identity_digest); + memcpy(search.digest, identity_digest, DIGEST_LEN); + ent = HT_FIND(channel_idmap, &channel_identity_map, &search); + if (ent) { + rv = LIST_FIRST(&ent->channel_list); } return rv; @@ -729,22 +707,7 @@ channel_next_with_digest(channel_t *chan) { tor_assert(chan); - return chan->next_with_same_id; -} - -/** - * Get previous channel with digest - * - * This function takes a channel and finds the previos channel in the list - * with the same digest. - */ - -channel_t * -channel_prev_with_digest(channel_t *chan) -{ - tor_assert(chan); - - return chan->prev_with_same_id; + return LIST_NEXT(chan, next_with_same_id); } /** @@ -773,6 +736,9 @@ channel_init(channel_t *chan) SIMPLEQ_INIT(&chan->incoming_queue); SIMPLEQ_INIT(&chan->outgoing_queue); + /* Initialize list entries. */ + memset(&chan->next_with_same_id, 0, sizeof(chan->next_with_same_id)); + /* Timestamp it */ channel_timestamp_created(chan); } @@ -2846,13 +2812,10 @@ channel_free_all(void) } /* Now free channel_identity_map */ - if (channel_identity_map) { - log_debug(LD_CHANNEL, - "Freeing channel_identity_map"); - /* Geez, anything still left over just won't die ... let it leak then */ - digestmap_free(channel_identity_map, NULL); - channel_identity_map = NULL; - } + log_debug(LD_CHANNEL, + "Freeing channel_identity_map"); + /* Geez, anything still left over just won't die ... let it leak then */ + HT_CLEAR(channel_idmap, &channel_identity_map); log_debug(LD_CHANNEL, "Done cleaning up after channels"); @@ -2959,12 +2922,6 @@ channel_get_for_extend(const char *digest, tor_assert(msg_out); tor_assert(launch_out); - if (!channel_identity_map) { - *msg_out = "Router not connected (nothing is). Connecting."; - *launch_out = 1; - return NULL; - } - chan = channel_find_by_remote_digest(digest); /* Walk the list, unrefing the old one and refing the new at each diff --git a/src/or/channel.h b/src/or/channel.h index ccb8fe8..1e7279a 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -122,7 +122,7 @@ struct channel_s { * Linked list of channels with the same identity digest, for the * digest->channel map */ - channel_t *next_with_same_id, *prev_with_same_id; + LIST_ENTRY(channel_s) next_with_same_id; /* List of incoming cells to handle */ chan_cell_queue_t incoming_queue; @@ -417,9 +417,7 @@ channel_t * channel_find_by_remote_digest(const char *identity_digest); /** For things returned by channel_find_by_remote_digest(), walk the list. */ - channel_t * channel_next_with_digest(channel_t *chan); -channel_t * channel_prev_with_digest(channel_t *chan); /* * Metadata queries/updates [View Less]

1 0

[tor/master] Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/tor
by andrea＠torproject.org 30 Oct '12

30 Oct '12

commit be371250305b0ac50c1fafda8acd13812894ab92 Merge: 03b3216 2b10e99 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Oct 30 14:39:14 2012 -0700 Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/tor LICENSE | 29 +++ changes/bsd_queue | 7 + src/ext/README | 8 + src/ext/include.am | 3 +- src/ext/tor_queue.h | 568 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/channel.c | 349 ++++++++++++------------------- … [View More] src/or/channel.h | 13 +- 7 files changed, 755 insertions(+), 222 deletions(-) diff --cc src/or/channel.c index 5552d39,7f3c6f5..cd5972f --- a/src/or/channel.c +++ b/src/or/channel.c @@@ -82,7 -81,37 +83,37 @@@ static uint64_t n_channels_allocated = * If more than one channel exists, follow the next_with_same_id pointer * as a linked list. */ - static digestmap_t *channel_identity_map = NULL; + HT_HEAD(channel_idmap, channel_idmap_entry_s) channel_identity_map = + HT_INITIALIZER(); + + typedef struct channel_idmap_entry_s { + HT_ENTRY(channel_idmap_entry_s) node; + uint8_t digest[DIGEST_LEN]; + LIST_HEAD(channel_list_s, channel_s) channel_list; + } channel_idmap_entry_t; + + static INLINE unsigned + channel_idmap_hash(const channel_idmap_entry_t *ent) + { + const unsigned *a = (const unsigned *)ent->digest; + #if SIZEOF_INT == 4 + return a[0] ^ a[1] ^ a[2] ^ a[3] ^ a[4]; + #elif SIZEOF_INT == 8 + return a[0] ^ a[1]; + #endif + } + + static INLINE int + channel_idmap_eq(const channel_idmap_entry_t *a, + const channel_idmap_entry_t *b) + { + return tor_memeq(a->digest, b->digest, DIGEST_LEN); + } + + HT_PROTOTYPE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, + channel_idmap_eq); + HT_GENERATE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, - channel_idmap_eq, 0.5, tor_malloc, tor_realloc, _tor_free); ++ channel_idmap_eq, 0.5, tor_malloc, tor_realloc, tor_free_); static cell_queue_entry_t * cell_queue_entry_dup(cell_queue_entry_t *q); static void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off); @@@ -881,52 -832,25 +852,43 @@@ channel_listener_free(channel_listener_ static void channel_force_free(channel_t *chan) { + cell_queue_entry_t *cell, *cell_tmp; tor_assert(chan); + log_debug(LD_CHANNEL, + "Force-freeing channel " U64_FORMAT " at %p", + U64_PRINTF_ARG(chan->global_identifier), chan); + + /* + * Get rid of cmux policy before we do anything, so cmux policies don't + * see channels in weird half-freed states. + */ + if (chan->cmux) { + circuitmux_set_policy(chan->cmux, NULL); + } + /* Call a free method if there is one */ if (chan->free) chan->free(chan); channel_clear_remote_end(chan); + /* Get rid of cmux */ + if (chan->cmux) { + circuitmux_free(chan->cmux); + chan->cmux = NULL; + } + /* We might still have a cell queue; kill it */ - if (chan->incoming_queue) { - SMARTLIST_FOREACH_BEGIN(chan->incoming_queue, - cell_queue_entry_t *, q) { - cell_queue_entry_free(q, 0); - } SMARTLIST_FOREACH_END(q); - - smartlist_free(chan->incoming_queue); - chan->incoming_queue = NULL; + SIMPLEQ_FOREACH_SAFE(cell, &chan->incoming_queue, next, cell_tmp) { + cell_queue_entry_free(cell, 0); } + SIMPLEQ_INIT(&chan->incoming_queue); /* Outgoing cell queue is similar, but we can have to free packed cells */ - if (chan->outgoing_queue) { - SMARTLIST_FOREACH_BEGIN(chan->outgoing_queue, - cell_queue_entry_t *, q) { - cell_queue_entry_free(q, 0); - } SMARTLIST_FOREACH_END(q); - - smartlist_free(chan->outgoing_queue); - chan->outgoing_queue = NULL; + SIMPLEQ_FOREACH_SAFE(cell, &chan->outgoing_queue, next, cell_tmp) { + cell_queue_entry_free(cell, 0); } + SIMPLEQ_INIT(&chan->outgoing_queue); tor_free(chan); } diff --cc src/or/channel.h index d90335c,1e7279a..d210655 --- a/src/or/channel.h +++ b/src/or/channel.h @@@ -6,10 -6,11 +6,11 @@@ * \brief Header file for channel.c **/ -#ifndef _TOR_CHANNEL_H -#define _TOR_CHANNEL_H +#ifndef TOR_CHANNEL_H +#define TOR_CHANNEL_H #include "or.h" + #include "tor_queue.h" #include "circuitmux.h" /* Channel handler function pointer typedefs */ [View Less]

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 30 Oct '12

30 Oct '12

commit cbe442a6e6393040b2445ed3a00baccd67f24875 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 21:45:11 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index f56d446..605e492 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -25,6 +25,8 @@ <string name="menu_stop">إيقاف</string> … [View More] <string name="menu_about">حول</string> <string name="menu_wizard">Wizard</string> + <string name="main_layout_download">تحميل</string> + <string name="main_layout_upload">تحميل</string> <string name="button_help">مساعدة</string> <string name="button_close">إغلاق</string> <string name="button_about">حول</string> @@ -72,6 +74,7 @@ <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string> + <string name="wizard_tips_duckgo">تطبيق محرك البحث DuckDuckGo</string> <string name="wizard_proxy_help_info">إعدادات الوكيل</string> <string name="wizard_proxy_help_msg">اذا كان تطبيق أندرويد الذي تستخدمه يمكن ان يدعم استخدام وكيل HTTP او SOCKS , عندها يمكنك تكوينه للإتصال بأوربوت واستخدام تور.\n\n\n اعدادات المستضيف هي 127.0.0.1 او \"المستضيف المحلي\". بالنسبة الى HTTP, فإن ضبط المنفذ هو 8118. بالنسبة الى SOCKS, فإن الوكيل هو 9050. يجب عليك استخدام SOCKS4A او SOCKS5 اذا امكن.\n \n\n\n يمكنك معرفة المزيد عن عملية توكيل غير مرئية للأندرويد عن طريق الأسئلة المتداولة (FAQ) في: http://tinyurl.com/proxyandroid\n </string> <string name="wizard_final">أوربوت جاهز!</string> @@ -100,6 +103,7 @@ <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject\n</string> <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string> [View Less]

1 0

r25857: {website} add fof.se article. (website/trunk/press/en)
by Andrew Lewman 30 Oct '12

30 Oct '12

Author: phobos Date: 2012-10-30 19:13:33 +0000 (Tue, 30 Oct 2012) New Revision: 25857 Modified: website/trunk/press/en/inthemedia.wml Log: add fof.se article. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2012-10-29 22:51:14 UTC (rev 25856) +++ website/trunk/press/en/inthemedia.wml 2012-10-30 19:13:33 UTC (rev 25857) @@ -32,6 +32,14 @@ <th>Topic</th> </tr> &… [View More]

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 30 Oct '12

30 Oct '12

commit caeccd5b346ccbca8cf26afaf34f23c098dcc915 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 13:15:28 2012 +0000 Update translations for tsum --- ja/short-user-manual_ja_noimg.xhtml | 36 +++++++++++++++++----------------- 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ja/short-user-manual_ja_noimg.xhtml b/ja/short-user-manual_ja_noimg.xhtml index 136e2cf..31e28c0 100644 --- a/ja/short-user-manual_ja_noimg.xhtml +++ b/ja/short-… [View More]user-manual_ja_noimg.xhtml @@ -83,35 +83,35 @@ sub 2048R/EB399FD7 2003-10-16 <li>Networkをクリックし、I use a proxy to access the Internetを選択します。</li> <li>Addressにオープンプロキシのアドレスを入力します。これはホスト名かIPアドレスです。</li> <li>プロキシのポートを入力します。</li> - <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li> - <li>Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> - <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li> + <li>一般にユーザー名とパスワードは不要です。必要な場合は正しいフィールドに情報を入力してください。</li> + <li>利用するプロキシのTypeを、HTTP/HTTPS, SOCKS4またはSOCKS5から選びます。</li> + <li>OKボタンを押します。VidaliaとTorはプロキシを利用してTorネットワークにアクセスするよう設定されました。</li> </ol> - <h2 id="frequently-asked-questions">Frequently Asked Questions</h2> - This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org. - <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3> - If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>. - If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions: + <h2 id="frequently-asked-questions">よくある質問</h2> + この節では一般的な質問へ答えます。もしあなたの質問がここになければ、help(a)rt.torproject.xn--org-u63b4bub2ewa1a2cx3ar5azd4j0726k. + <h3 id="unable-to-extract-the-archive">アーカイブが展開できない</h3> + Windowsを使っていてアーカイブが展開できない場合、<a href="http://www.7-zip.org/">7-Zip</a>をダウンロードしてインストールしてください。 + 7-Zipがダウンロードできない場合、ファイル名を.zから.zipにリネームしてwinzipで展開してみてください。ファイル名を変更する前にWindowsが拡張子を表示するようにします: <h4 id="windows-xp">Windows XP</h4> <ol style="list-style-type: decimal"> - <li>Open My Computer</li> - <li>Click on Tools and choose Folder Options... in the menu</li> - <li>Click on the View tab</li> - <li>Uncheck Hide extensions for known file types and click OK</li> + <li>マイコンピュータを開きます</li> + <li>メニューのツールをクリックしフォルダオプションを選びます</li> + <li>表示タブをクリックします</li> + <li>登録されている拡張子は表示しないのチェックを外しOKをクリックします</li> </ol> <h4 id="windows-vista">Windows Vista</h4> <ol style="list-style-type: decimal"> - <li>Open Computer</li> + <li>コンピュータを開きます</li> <li>Click on Organize and choose Folder and search options in the menu</li> - <li>Click on the View tab</li> - <li>Uncheck Hide extensions for known file types and click OK</li> + <li>表示タブをクリックします</li> + <li>登録されている拡張子は表示しないのチェックを外しOKをクリックします</li> </ol> <h4 id="windows-7">Windows 7</h4> <ol style="list-style-type: decimal"> - <li>Open Computer</li> + <li>コンピュータを開きます</li> <li>Click on Organize and choose Folder and search options in the menu</li> - <li>Click on the View tab</li> - <li>Uncheck Hide extensions for known file types and click OK</li> + <li>表示タブをクリックします</li> + <li>登録されている拡張子は表示しないのチェックを外しOKをクリックします</li> </ol> <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3> You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems: [View Less]

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 30 Oct '12

30 Oct '12

commit 16d29f4548236e946867a78532d0d66be5840883 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 12:45:21 2012 +0000 Update translations for tsum --- ja/short-user-manual_ja_noimg.xhtml | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ja/short-user-manual_ja_noimg.xhtml b/ja/short-user-manual_ja_noimg.xhtml index 572a605..136e2cf 100644 --- a/ja/short-user-manual_ja_noimg.xhtml +++ b/ja/short-user-… [View More]manual_ja_noimg.xhtml @@ -71,18 +71,18 @@ sub 2048R/EB399FD7 2003-10-16 もしTorがまだ動かないなら、インターネットサービスプロバイダ(ISP)がTorをブロックしている可能性があります。これは多くの場合、リレーを隠蔽し簡単にブロックできなくするTorブリッジで対処できます。 もしTorが接続できない理由を見つけるのに助けが必要なら、ログファイルの関係する部分を含むメールをhelp(a)rt.torproject.org に送ってください。 <h3 id="how-to-find-a-bridge">ブリッジの見つけ方</h3> - To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write get bridges in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address. - Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often. - <h3 id="how-to-use-a-bridge">How to use a bridge</h3> - Once you have a set of bridges to use, open the Vidalia control panel, click on Settings, Network and tick the box that says My ISP blocks connections to the Tor network. Enter the bridges in the box below, hit OK and start Tor again. - <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3> - If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet. - The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. + ブリッジを使うには、初めに利用するブリッジを決める必要があります; <a href="https://bridges.torproject.org/">bridges.torproject.org</a>を見るか、bridges(a)torproject.xn--org-v73b3a1byghz8qpb7g1dz8cke5kx288l.xn--q6jzlka5i8a31bic1gv426aezie20bleens5nget bridgesと書いてください。これがないと返信が受け取れません。このメールはgmail.comかyahoo.comのアドレスから送る必要があることに注意してください。 + 複数のブリッジアドレスを設定するといくつかのブリッジに繋がらない場合、Torの接続はより安定します。いま利用しているブリッジが明日も利用可能であることは保証されないので、ブリッジのリストを頻繁に更新するよう習慣付けるべきです。 + <h3 id="how-to-use-a-bridge">ブリッジの利用法</h3> + 使用するブリッジのリストを入手したら、Vidaliaのコントロールパネルを開き、Settings, Network をクリックして、My ISP blocks connections to the Tor networkにチェックをつけてください。ブリッジのリストを下のボックスに入力し、OKを押してTorを再起動してください。 + <h3 id="how-to-use-an-open-proxy">オープンプロキシの利用方法</h3> + ブリッジが動かない場合、TorがHTTPSかSOCKSを通してTorネットワークにアクセスする設定を試してください。これはTorがローカルネットワークにブロックされていても、オープンプロキシは安全にTorネットワークにそして無検閲のインターネットへ接続するため利用できます。 + 以下のステップはTor/Vidalia機能するよう設定されていること、HTTPSやSOCKS4またはSOCKS5のプロキシのリストを見つけていることを前提にします。 <ol style="list-style-type: decimal"> - <li>Open the Vidalia control panel, click on Settings.</li> - <li>Click Network. Select I use a proxy to access the Internet.</li> - <li>On the Address line, enter the open proxy address. This can be a hostname or an IP Address.</li> - <li>Enter the port for the proxy.</li> + <li>Vidaliaのコントロールパネルを開き、Settingsをクリックします。</li> + <li>Networkをクリックし、I use a proxy to access the Internetを選択します。</li> + <li>Addressにオープンプロキシのアドレスを入力します。これはホスト名かIPアドレスです。</li> + <li>プロキシのポートを入力します。</li> <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li> <li>Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li> [View Less]

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 30 Oct '12

30 Oct '12

commit 2a0965d3f3e30612f17eff6f525506c1535974e2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 12:15:42 2012 +0000 Update translations for tsum --- ja/short-user-manual_ja_noimg.xhtml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ja/short-user-manual_ja_noimg.xhtml b/ja/short-user-manual_ja_noimg.xhtml index 15ee8cc..572a605 100644 --- a/ja/short-user-manual_ja_noimg.xhtml +++ b/ja/short-user-manual_ja_noimg.… [View More]xhtml @@ -18,7 +18,7 @@ <h3 id="how-to-get-tor-via-email">メール経由でTorを入手する方法</h3> Windows用の英語版Tor Browser Bundleを受けとるには、本文にwindowsと記入してgettor(a)torproject.xn--org-u63b4bub2ewa1a2pllx7azd4j0726k.xn--n8j3b8a5a7e6f308u3rilk3ci48a. またMac OS X用のTor Browser Bundle (macos-i386と記入)やLinux用(32ビット環境ならlinux-i386、64ビット環境ならlinux-x86_64と記入)を要求できます。 - もし翻訳版のTorが欲しいときは代わりにhelpと記入してください。手順と存在する言語のリストが書かれたメールを受けとることができます。 + もし翻訳版のTorが欲しいときは代わりにhelpと記入してください。手順と利用可能な言語のリストが書かれたメールを受けとることができます。 注: Linux用とMac OS X用のTor Browser Bundleはやや大きいので、GmailやHotmail、Yahooアカウントでは受けとることが出来ないでしょう。もしあなたが欲しいバンドルを受け取れない時は、help(a)rt.torproject.xn--org-u63b4bub2ewa1ai6wri11b9dyk4310l.xn--88j7am8dxc4b0huf8g1i3d4jq096a0fmuog8n3mjbvb7u6azhza. <h3 id="tor-for-smartphones">スマートフォンのためのTor</h3> Orbotという名前のパッケージをインストールすることでAndroid端末用のTorを入手出来ます。Orbotのダウンロードとインストールの方法は<a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>を見てください。 @@ -66,11 +66,11 @@ sub 2048R/EB399FD7 2003-10-16 いくらかのユーザーはVidaliaがTorネットワークへの接続に失敗することに気づくでしょう。この場合、インターネットへ接続していることを確認してください。もしプロキシサーバーへの接続を望むなら、下のオープンプロキシの利用方法を見てください。 もし通常のインターネット接続が動いているのに、Torがネットワークに接続できない場合、以下を試してください: Vidaliaのコントロールパネルを開き、Message Logをクリックし、Advancedタブを選択します。Torが接続できない理由があるかもしれません: Your system clock is off: あなたのシステムの日付と時刻が正しいことを確認して、Torを再起動してください。システムクロックをインターネットタイムサーバーと同期する必要があるかもしれません。 - You are behind a restrictive firewall: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on Settings and Network, and tick the box that says My firewall only lets me connect to certain ports. - Your anti-virus program is blocking Tor: Make sure that your anti-virus program is not preventing Tor from making network connections. - If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with Tor bridges, hidden relays that aren't as easy to block. - If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file. - <h3 id="how-to-find-a-bridge">How to find a bridge</h3> + You are behind a restrictive firewall: Torが80番と443番のポートだけを試すよう、Vidaliaのコントロールパネルを開き、SettingsそしてNetworkをクリックし、My firewall only lets me connect to certain portsにチェックをつけてください。 + Your anti-virus program is blocking Tor: アンチウィルスプログラムを確認しTorがネットワークに接続することを阻まないようにしてください。 + もしTorがまだ動かないなら、インターネットサービスプロバイダ(ISP)がTorをブロックしている可能性があります。これは多くの場合、リレーを隠蔽し簡単にブロックできなくするTorブリッジで対処できます。 + もしTorが接続できない理由を見つけるのに助けが必要なら、ログファイルの関係する部分を含むメールをhelp(a)rt.torproject.org に送ってください。 + <h3 id="how-to-find-a-bridge">ブリッジの見つけ方</h3> To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write get bridges in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address. Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often. <h3 id="how-to-use-a-bridge">How to use a bridge</h3> [View Less]

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 30 Oct '12

30 Oct '12

commit c10e1ef43240f943224861de72ab0eddeac9af26 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 11:45:21 2012 +0000 Update translations for tsum --- ja/short-user-manual_ja_noimg.xhtml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ja/short-user-manual_ja_noimg.xhtml b/ja/short-user-manual_ja_noimg.xhtml index 6060d65..15ee8cc 100644 --- a/ja/short-user-manual_ja_noimg.xhtml +++ b/ja/short-user-manual_ja_noimg.… [View More]xhtml @@ -56,16 +56,16 @@ sub 2048R/EB399FD7 2003-10-16 </pre> 出力は"Good signature"になるはずです。悪い署名はファイルが改竄されていることを示唆します。もしあなたが悪い署名を確認したら、パッケージをどこからダウンロードしたか、どのように署名を検証したか、それにGnuPGの出力をhelp(a)rt.torproject.xn--org-u63b4bub2ewa1ai7bz1izd4j0726k. 署名を検証して"Good signature"の出力が得られたら、先に進みパッケージアーカイブを展開します。tor-browser_en-USのようなディレクトリができるはずです。このディレクトリにはchangelogという名前のファイルを含むDocsという名前のディレクトリがあります。changelogファイルの先頭行のバージョン番号がファイル名のバージョン番号と一致することを確認してください。 - <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3> + <h3 id="how-to-use-the-tor-browser-bundle">Tor Browser Bundleの使い方</h3> After downloading the Tor Browser Bundle, extract the package onto your desktop or a USB stick. You should have a directory containing a few files. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system). - When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor. + Tor Browser Bundleを開始すると、初めににVidaliaが起動しTorネットワークへ接続されます。その後、Torを使っていることを確認する画面が表示されます。これは<a href="https://check.torproject.org/">https://check.torproject.org/</a>を表示することで行われます。これでインターネットをTor経由で利用する準備が整いました。 - Please note that it is important that you use the browser that comes with the bundle, and not your own browser. + あなたのブラウザーではなく、バンドルに付属するブラウザーを利用することが重要であるということに注意してください。 - <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3> - Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see How to use an open proxy below. - If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on Message Log and select the Advanced tab. It may be that Tor won't connect because: - Your system clock is off: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server. + <h3 id="what-to-do-when-tor-does-not-connect">Torが接続できないときにすべきこと</h3> + いくらかのユーザーはVidaliaがTorネットワークへの接続に失敗することに気づくでしょう。この場合、インターネットへ接続していることを確認してください。もしプロキシサーバーへの接続を望むなら、下のオープンプロキシの利用方法を見てください。 + もし通常のインターネット接続が動いているのに、Torがネットワークに接続できない場合、以下を試してください: Vidaliaのコントロールパネルを開き、Message Logをクリックし、Advancedタブを選択します。Torが接続できない理由があるかもしれません: + Your system clock is off: あなたのシステムの日付と時刻が正しいことを確認して、Torを再起動してください。システムクロックをインターネットタイムサーバーと同期する必要があるかもしれません。 You are behind a restrictive firewall: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on Settings and Network, and tick the box that says My firewall only lets me connect to certain ports. Your anti-virus program is blocking Tor: Make sure that your anti-virus program is not preventing Tor from making network connections. If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with Tor bridges, hidden relays that aren't as easy to block. [View Less]

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 30 Oct '12

30 Oct '12

commit ee1a5dc46f0484315180f74ab26526af248ccd9c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 02:45:12 2012 +0000 Update translations for tsum --- ja/short-user-manual_ja_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ja/short-user-manual_ja_noimg.xhtml b/ja/short-user-manual_ja_noimg.xhtml index 28e1b95..6060d65 100644 --- a/ja/short-user-manual_ja_noimg.xhtml +++ b/ja/short-user-manual_ja_noimg.xhtml @@ -55,… [View More]7 +55,7 @@ sub 2048R/EB399FD7 2003-10-16 </code> </pre> 出力は"Good signature"になるはずです。悪い署名はファイルが改竄されていることを示唆します。もしあなたが悪い署名を確認したら、パッケージをどこからダウンロードしたか、どのように署名を検証したか、それにGnuPGの出力をhelp(a)rt.torproject.xn--org-u63b4bub2ewa1ai7bz1izd4j0726k. - Once you have verified the signature and seen the "Good signature" output, go ahead and extract the package archive. You should then see a directory similar to tor-browser_en-US. Inside that directory is another directory called Docs, which contains a file called changelog. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename. + 署名を検証して"Good signature"の出力が得られたら、先に進みパッケージアーカイブを展開します。tor-browser_en-USのようなディレクトリができるはずです。このディレクトリにはchangelogという名前のファイルを含むDocsという名前のディレクトリがあります。changelogファイルの先頭行のバージョン番号がファイル名のバージョン番号と一致することを確認してください。 <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3> After downloading the Tor Browser Bundle, extract the package onto your desktop or a USB stick. You should have a directory containing a few files. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system). When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor. [View Less]

1 0

[stem/master] Conficting DataDirectory for process tests
by atagar＠torproject.org 30 Oct '12

30 Oct '12

commit 56aac96d6213f28a6b597c640affc7a5a963bf75 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 29 19:26:42 2012 -0700 Conficting DataDirectory for process tests The process module's integ tests start and stop tor instances. However, if you're already running tor then the DataDirectory of these instances will conflict with what you're already running... Oct 29 19:18:11.532 [notice] Tor v0.2.1.30. This is experimental software. Do not rely on … [View More]it for strong anonymity. (Running on Linux i686) Oct 29 19:18:11.540 [warn] ControlPort is open, but no authentication method has been configured. This means that any program on your computer can reconfigure your Tor. That's bad! You should upgrade your Tor controller as soon as possible. Oct 29 19:18:11.541 [notice] Initialized libevent version 1.4.13-stable using method epoll. Good. Oct 29 19:18:11.542 [notice] Opening Socks listener on 127.0.0.1:2777 Oct 29 19:18:11.543 [notice] Opening Control listener on 127.0.0.1:2778 Oct 29 19:18:11.543 [warn] It looks like another Tor process is running with the same data directory. Waiting 5 seconds to see if it goes away. Oct 29 19:18:16.546 [err] No, it's still there. Exiting. Issue spotted by gsathya on... https://trac.torproject.org/7251 --- test/integ/process.py | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index 5396756..127eb40 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -4,6 +4,7 @@ Tests the stem.process functions with various use cases. import os import time +import shutil import signal import unittest @@ -13,7 +14,15 @@ import stem.process import test.runner import stem.util.system +DATA_DIRECTORY = '/tmp/stem_integ' + class TestProcess(unittest.TestCase): + def setUp(self): + os.makedirs(DATA_DIRECTORY) + + def tearDown(self): + shutil.rmtree(DATA_DIRECTORY, ignore_errors = True) + def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config. @@ -31,7 +40,11 @@ class TestProcess(unittest.TestCase): runner = test.runner.get_runner() tor_process = stem.process.launch_tor_with_config( tor_cmd = runner.get_tor_command(), - config = {'SocksPort': '2777', 'ControlPort': '2778'}, + config = { + 'SocksPort': '2777', + 'ControlPort': '2778', + 'DataDirectory': DATA_DIRECTORY, + }, completion_percent = 5 ) @@ -71,7 +84,8 @@ class TestProcess(unittest.TestCase): runner = test.runner.get_runner() start_time = time.time() - self.assertRaises(OSError, stem.process.launch_tor_with_config, {'SocksPort': '2777'}, runner.get_tor_command(), 100, None, 2) + config = {'SocksPort': '2777', 'DataDirectory': DATA_DIRECTORY} + self.assertRaises(OSError, stem.process.launch_tor_with_config, config, runner.get_tor_command(), 100, None, 2) runtime = time.time() - start_time if not (runtime > 2 and runtime < 3): [View Less]

1 0