- tor-commits - lists.torproject.org

r24736: {projects} updated torrc (projects/android/trunk/Orbot/res/raw)
by Nathan Freitas 09 May '11

09 May '11

Author: n8fr8 Date: 2011-05-10 02:08:28 +0000 (Tue, 10 May 2011) New Revision: 24736 Modified: projects/android/trunk/Orbot/res/raw/torrc Log: updated torrc Modified: projects/android/trunk/Orbot/res/raw/torrc =================================================================== --- projects/android/trunk/Orbot/res/raw/torrc 2011-05-10 02:08:16 UTC (rev 24735) +++ projects/android/trunk/Orbot/res/raw/torrc 2011-05-10 02:08:28 UTC (rev 24736) @@ -1,5 +1,4 @@ SocksPort 9050 -SocksListenAddress 127.0.0.1 SafeSocks 1 Log notice stdout ControlPort 9051

1 0

r24735: {projects} fixed onboot handling and updated transproxy (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
by Nathan Freitas 09 May '11

09 May '11

Author: n8fr8 Date: 2011-05-10 02:08:16 +0000 (Tue, 10 May 2011) New Revision: 24735 Modified: projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java Log: fixed onboot handling and updated transproxy Modified: projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java 2011-05-10 01:43:30 UTC (rev 24734) +++ projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java 2011-05-10 02:08:16 UTC (rev 24735) @@ -1,5 +1,7 @@ package org.torproject.android; +import org.torproject.android.service.TorService; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -8,10 +10,18 @@ @Override public void onReceive(Context context, Intent intent) { - Intent serviceIntent = new Intent(); - serviceIntent.setAction("org.torproject.android.service.TorService"); - context.startService(serviceIntent); + if (intent.getAction() != null + && intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) + { + //Phase 1: Launch a service + Intent service = new Intent(); + service.setAction("onboot"); + service.setClass(context, TorService.class); + context.startService(service); + } + + } Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-10 01:43:30 UTC (rev 24734) +++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java 2011-05-10 02:08:16 UTC (rev 24735) @@ -68,7 +68,6 @@ //if Tor binary is not running, then start the service up startService(new Intent(INTENT_TOR_SERVICE)); - bindService (); setTheme(android.R.style.Theme_Black_NoTitleBar); @@ -81,6 +80,9 @@ lblStatus.setOnLongClickListener(this); imgStatus = (ImageView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); + + + } /* @@ -248,13 +250,10 @@ protected void onPause() { super.onPause(); - if (progressDialog != null) - { - progressDialog.dismiss(); - progressDialog = null; - } - + hideProgressDialog(); + if (aDialog != null) + aDialog.dismiss(); } public void onSaveInstanceState(Bundle savedInstanceState) { @@ -333,6 +332,8 @@ protected void onResume() { super.onResume(); + bindService(); + updateStatus(""); if (getIntent() == null) @@ -423,7 +424,6 @@ updateStatus (""); - } /* (non-Javadoc) @@ -432,7 +432,7 @@ protected void onStop() { super.onStop(); - unbindService(); + //unbindService(); } @@ -478,13 +478,20 @@ } } + AlertDialog aDialog = null; + private void showAlert(String title, String msg, boolean button) { - AlertDialog aDialog = null; + try + { + if (aDialog != null && aDialog.isShowing()) + aDialog.dismiss(); + } + catch (Exception e){} //swallow any errors if (button) { - aDialog = new AlertDialog.Builder(this) + aDialog = new AlertDialog.Builder(this) .setIcon(R.drawable.icon) .setTitle(title) .setMessage(msg) @@ -520,13 +527,8 @@ { imgStatus.setImageResource(R.drawable.toron); - if (progressDialog != null) - { - progressDialog.dismiss(); - progressDialog = null; - } + hideProgressDialog(); - String lblMsg = getString(R.string.status_activated); //+ "\n" + torServiceMsg; @@ -571,11 +573,8 @@ { imgStatus.setImageResource(R.drawable.toroff); - if (progressDialog != null) - { - progressDialog.dismiss(); - progressDialog = null; - } + + hideProgressDialog(); lblStatus.setText(getString(R.string.status_shutting_down)); @@ -585,11 +584,8 @@ else { - if (progressDialog != null) - { - progressDialog.dismiss(); - progressDialog = null; - } + + hideProgressDialog(); imgStatus.setImageResource(R.drawable.toroff); lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); @@ -612,6 +608,8 @@ private void startTor () throws RemoteException { + bindService(); + mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on imgStatus.setImageResource(R.drawable.torstarting); @@ -633,9 +631,7 @@ mHandler.sendMessage(msg); } - // stopService(new Intent(ITorService.class.getName())); - - + } /* @@ -655,8 +651,9 @@ else if (mService.getStatus() == STATUS_READY) { + createProgressDialog(getString(R.string.status_starting_up)); + startTor(); - } else { @@ -721,7 +718,6 @@ break; case TorServiceConstants.ENABLE_TOR_MSG: - createProgressDialog(getString(R.string.status_starting_up)); updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG)); @@ -737,17 +733,8 @@ } } - private synchronized void createProgressDialog (String msg) - { - if (progressDialog == null) - { - progressDialog = ProgressDialog.show(Orbot.this, "", msg); - - progressDialog.setCancelable(true); - } - - } + }; @@ -811,8 +798,6 @@ mIsBound = true; - - } private void unbindService () @@ -837,4 +822,25 @@ } } + private void createProgressDialog (String msg) + { + if (progressDialog != null && progressDialog.isShowing()) + return; + + progressDialog = ProgressDialog.show(Orbot.this, "", msg); + progressDialog.setCancelable(true); + + } + + private void hideProgressDialog () + { + + if (progressDialog != null && progressDialog.isShowing()) + { + progressDialog.dismiss(); + + } + + + } } Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java 2011-05-10 01:43:30 UTC (rev 24734) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java 2011-05-10 02:08:16 UTC (rev 24735) @@ -313,6 +313,49 @@ return code; } + public static int enableWifiHotspotRules (Context context) throws Exception + { + + boolean runRoot = true; + boolean waitFor = true; + + //redirectDNSResolvConf(); //not working yet + + String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath(); + + StringBuilder script = new StringBuilder(); + + StringBuilder res = new StringBuilder(); + int code = -1; + + script.append(ipTablesPath); + script.append(" -I FORWARD"); + script.append(" -m state --state ESTABLISHED,RELATED -j ACCEPT"); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -I FORWARD"); + script.append(" -s 192.168.43.0/24 -j ACCEPT"); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -P FORWARD DROP"); + script.append(" || exit\n"); + + script.append(ipTablesPath); + script.append(" -t nat -I POSTROUTING -s 192.168.43.0/24 -j MASQUERADE"); + script.append(" || exit\n"); + + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); + String msg = res.toString(); + TorService.logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg); + + + return code; + } + public static int setTransparentProxyingAll(Context context) throws Exception { boolean runRoot = true; @@ -329,6 +372,8 @@ purgeIptables(context); + //enableWifiHotspotRules(context); + int torUid = context.getApplicationInfo().uid; // Set up port redirection

1 0

[arm/master] fix: Selection crashed an empty connection panel
by atagar＠torproject.org 09 May '11

09 May '11

commit 9fbed0c32c88b534b79485748031996ec2b05946 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 18:55:58 2011 -0700 fix: Selection crashed an empty connection panel If there were no connection results, pressing enter on the connection page would crash arm. This isn't a commonly encountered use case, but could arise if you both lack permissions to query connections and don't have any circuits. Caught by asn (https://trac.torproject.org/projects/tor/ticket/3128) --- src/cli/connections/connPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 4d89d5c..36687ac 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -151,7 +151,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if self._showDetails: pageHeight -= (DETAILS_HEIGHT + 1) isChanged = self._scroller.handleKey(key, self._entryLines, pageHeight) if isChanged: self.redraw(True) - elif uiTools.isSelectionKey(key): + elif uiTools.isSelectionKey(key) and self._entries: self._showDetails = not self._showDetails self.redraw(True) elif key == ord('s') or key == ord('S'): @@ -256,7 +256,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): cursorSelection = self._scroller.getCursorSelection(self._entryLines) # draws the detail panel if currently displaying it - if self._showDetails: + if self._showDetails and cursorSelection: # This is a solid border unless the scrollbar is visible, in which case a # 'T' pipe connects the border to the bar. uiTools.drawBox(self, 0, 0, width, DETAILS_HEIGHT + 2)

1 0

[arm/master] Moving torrc reloading to torrc panel
by atagar＠torproject.org 09 May '11

09 May '11

commit f494a50901129123890e11d0ef07fb16d1eaa1de Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 9 18:48:07 2011 -0700 Moving torrc reloading to torrc panel --- src/cli/controller.py | 25 ------------------------- src/cli/torrcPanel.py | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 6f4b70d..3d40631 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -1157,31 +1157,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): setPauseState(panels, isPaused, page) finally: panel.CURSES_LOCK.release() - elif page == 3 and key == ord('r') or key == ord('R'): - # reloads torrc, providing a notice if successful or not - loadedTorrc = torConfig.getTorrc() - loadedTorrc.getLock().acquire() - - try: - loadedTorrc.load() - isSuccessful = True - except IOError: - isSuccessful = False - - loadedTorrc.getLock().release() - - #isSuccessful = panels["torrc"].loadConfig(logErrors = False) - #confTypeLabel = confPanel.CONFIG_LABELS[panels["torrc"].configType] - resetMsg = "torrc reloaded" if isSuccessful else "failed to reload torrc" - if isSuccessful: - panels["torrc"]._lastContentHeightArgs = None - panels["torrc"].redraw(True) - - panels["control"].setMsg(resetMsg, curses.A_STANDOUT) - panels["control"].redraw(True) - time.sleep(1) - - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) else: for pagePanel in getPanels(page + 1): isKeystrokeConsumed = pagePanel.handleKey(key) diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index 5ca839f..75ddd1b 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -6,6 +6,8 @@ import math import curses import threading +import popups + from util import conf, enum, panel, torConfig, uiTools DEFAULT_CONFIG = {"features.config.file.showScrollbars": True, @@ -57,6 +59,19 @@ class TorrcPanel(panel.Panel): self.stripComments = not self.stripComments self._lastContentHeightArgs = None self.redraw(True) + elif key == ord('r') or key == ord('R'): + # reloads torrc, providing a notice if successful or not + try: + torConfig.getTorrc().load() + self._lastContentHeightArgs = None + self.redraw(True) + resultMsg = "torrc reloaded" + except IOError: + resultMsg = "failed to reload torrc" + + self._lastContentHeightArgs = None + self.redraw(True) + popups.showMsg(resultMsg, 1) else: isKeystrokeConsumed = False self.valsLock.release()

1 0

r24734: {website} fix a missing </a>, link to spaces. (website/trunk/donate/en)
by Andrew Lewman 09 May '11

09 May '11

Author: phobos Date: 2011-05-10 01:43:30 +0000 (Tue, 10 May 2011) New Revision: 24734 Modified: website/trunk/donate/en/donate.wml Log: fix a missing </a>, link to spaces. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-10 01:18:00 UTC (rev 24733) +++ website/trunk/donate/en/donate.wml 2011-05-10 01:43:30 UTC (rev 24734) @@ -30,7 +30,7 @@ <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  <a id="paypal"></a> - <a class="anchor" href="#paypal"></a> + <a class="anchor" href="#paypal"> </a> <div class="title toptwenty">Tor Project Subscription via PayPal</div> <div class="left hundred"> <div class="paypal focus"> @@ -126,7 +126,7 @@   <a id="amazon"></a> - <a class="anchor" href="#amazon"></a> + <a class="anchor" href="#amazon"> </a> <div class="title topforty">Single Donation via Amazon Payments</div> <div class="hundred left"> <div class="paypal focus"> @@ -158,7 +158,7 @@   <a id="google"></a> - <a class="anchor" href="#google"></a> + <a class="anchor" href="#google"> </a> <div class="title topforty">Single Donation via Google Checkout</div> <div class="hundred left"> <div class="paypal focus"> @@ -202,7 +202,7 @@   <a id="givv"></a> - <a class="anchor" href="#givv"> + <a class="anchor" href="#givv"> </a> <div class="title topforty">Donate via Givv.org</div> <div class="hundred left"> <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. @@ -212,7 +212,7 @@   <a id="cash"></a> - <a class="anchor" href="#cash"></a> + <a class="anchor" href="#cash"> </a> <div class="title toptwenty">Donate via Check, Cash, or Money Order</div> <div class="left hundred"> <p>You can send checks or money orders to:</p>

1 0

r24733: {website} keeping the purple highlight clean looks better. (website/trunk/donate/en)
by Andrew Lewman 09 May '11

09 May '11

Author: phobos Date: 2011-05-10 01:18:00 +0000 (Tue, 10 May 2011) New Revision: 24733 Modified: website/trunk/donate/en/donate.wml Log: keeping the purple highlight clean looks better. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-10 01:14:05 UTC (rev 24732) +++ website/trunk/donate/en/donate.wml 2011-05-10 01:18:00 UTC (rev 24733) @@ -126,7 +126,8 @@   <a id="amazon"></a> - <div class="title topforty"><a class="anchor" href="#amazon">Single Donation via Amazon Payments</a></div> + <a class="anchor" href="#amazon"></a> + <div class="title topforty">Single Donation via Amazon Payments</div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4> @@ -157,8 +158,8 @@   <a id="google"></a> - <div class="title topforty"><a class="anchor" href="#google">Single -Donation via Google Checkout</a></div> + <a class="anchor" href="#google"></a> + <div class="title topforty">Single Donation via Google Checkout</div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4> @@ -201,9 +202,8 @@   <a id="givv"></a> - <div class="title topforty"><a class="anchor" href="#givv">Donate via -Givv.org</a> - </div> + <a class="anchor" href="#givv"> + <div class="title topforty">Donate via Givv.org</div> <div class="hundred left"> <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. Automatic, one-click giving. You stay anonymous and stay in control! @@ -212,9 +212,8 @@   <a id="cash"></a> - <div class="title toptwenty"><a class="anchor" href="#cash">Donate via -Check, Cash, or Money Order</a> - </div> + <a class="anchor" href="#cash"></a> + <div class="title toptwenty">Donate via Check, Cash, or Money Order</div> <div class="left hundred"> <p>You can send checks or money orders to:</p> <p>The Tor Project, Inc<br>

1 0

r24732: {website} lets see if this looks better in the purple highlight. (website/trunk/donate/en)
by Andrew Lewman 09 May '11

09 May '11

Author: phobos Date: 2011-05-10 01:14:05 +0000 (Tue, 10 May 2011) New Revision: 24732 Modified: website/trunk/donate/en/donate.wml Log: lets see if this looks better in the purple highlight. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-10 01:10:35 UTC (rev 24731) +++ website/trunk/donate/en/donate.wml 2011-05-10 01:14:05 UTC (rev 24732) @@ -30,8 +30,8 @@ <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  <a id="paypal"></a> - <div class="title toptwenty"> <a class="anchor" href="#paypal">Tor Project -Subscription via PayPal</a></div> + <a class="anchor" href="#paypal"></a> + <div class="title toptwenty">Tor Project Subscription via PayPal</div> <div class="left hundred"> <div class="paypal focus"> <h4>Monthly Subscription to The Tor Project</h4> @@ -126,8 +126,7 @@   <a id="amazon"></a> - <div class="title topforty"><a class="anchor" href="#amazon">Single Donation -via Amazon Payments</a></div> + <div class="title topforty"><a class="anchor" href="#amazon">Single Donation via Amazon Payments</a></div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4>

1 0

r24731: {website} make the list of ways to donate a linkable list to the corre (website/trunk/donate/en)
by Andrew Lewman 09 May '11

09 May '11

Author: phobos Date: 2011-05-10 01:10:35 +0000 (Tue, 10 May 2011) New Revision: 24731 Modified: website/trunk/donate/en/donate.wml Log: make the list of ways to donate a linkable list to the correct section below. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-07 04:03:13 UTC (rev 24730) +++ website/trunk/donate/en/donate.wml 2011-05-10 01:10:35 UTC (rev 24731) @@ -20,16 +20,18 @@ href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx">GuideStar</a>. We're happy to accept donations via: <ul> - <li>Paypal</li> - <li>Amazon Payments</li> - <li>Google Checkout</li> - <li>Givv.org</li> - <li>checks, money orders, bank transfers, stock grants or other more - sophisticated transactions.</li> + <li><a href="#paypal">Paypal</a></li> + <li><a href="#amazon">Amazon Payments</a></li> + <li><a href="#google">Google Checkout</a></li> + <li><a href="#givv">Givv.org</a></li> + <li><a href="#cash">checks, money orders, bank transfers, stock grants or +other more sophisticated transactions.</a></li> </ul></p> <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p>  - <div class="title toptwenty">Tor Project Subscription via PayPal</div> + <a id="paypal"></a> + <div class="title toptwenty"> <a class="anchor" href="#paypal">Tor Project +Subscription via PayPal</a></div> <div class="left hundred"> <div class="paypal focus"> <h4>Monthly Subscription to The Tor Project</h4> @@ -123,7 +125,9 @@ </div>   - <div class="title topforty">Single Donation via Amazon Payments</div> + <a id="amazon"></a> + <div class="title topforty"><a class="anchor" href="#amazon">Single Donation +via Amazon Payments</a></div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4> @@ -153,12 +157,14 @@ </div>   - <div class="title topforty">Single Donation via Google Checkout</div> + <a id="google"></a> + <div class="title topforty"><a class="anchor" href="#google">Single +Donation via Google Checkout</a></div> <div class="hundred left"> <div class="paypal focus"> <h4>Make a single donation.</h4> -<script type="text/javascript"> +<script type="text/javascript"> function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ return true; @@ -195,7 +201,9 @@ </div>   - <div class="title topforty">Donate via Givv.org + <a id="givv"></a> + <div class="title topforty"><a class="anchor" href="#givv">Donate via +Givv.org</a> </div> <div class="hundred left"> <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. @@ -204,7 +212,9 @@ </div>   - <div class="title toptwenty">Donate via Check, Cash, or Money Order + <a id="cash"></a> + <div class="title toptwenty"><a class="anchor" href="#cash">Donate via +Check, Cash, or Money Order</a> </div> <div class="left hundred"> <p>You can send checks or money orders to:</p>

1 0

[tor/master] Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
by nickm＠torproject.org 09 May '11

09 May '11

commit 09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57 Merge: 0b3166f cd42ae7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 13:37:56 2011 -0400 Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2 changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-)

1 0

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

09 May '11

commit e6980faec43504ac32ddd96d9c2bddcccca3a21b Merge: acd6a48 09d7af7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 13:39:51 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/directory.c changes/bug3022 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 1 + src/or/networkstatus.c | 2 +- src/or/or.h | 4 +++- 6 files changed, 18 insertions(+), 2 deletions(-) diff --cc src/or/directory.c index 145de3d,68734e6..313c6c5 --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -357,19 -347,20 +357,20 @@@ directory_get_from_dirserver(uint8_t di * it elsewhere in directory.c. -RD */ switch (dir_purpose) { case DIR_PURPOSE_FETCH_EXTRAINFO: - type = EXTRAINFO_CACHE | - (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V3_AUTHORITY); + type = EXTRAINFO_DIRINFO | + (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO : + V3_DIRINFO); break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: - type = V2_AUTHORITY; + type = V2_DIRINFO; + prefer_authority = 1; /* Only v2 authorities have these anyway. */ break; case DIR_PURPOSE_FETCH_SERVERDESC: - type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V3_AUTHORITY); + type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO : + V3_DIRINFO); break; case DIR_PURPOSE_FETCH_RENDDESC: - type = HIDSERV_AUTHORITY; + type = HIDSERV_DIRINFO; break; case DIR_PURPOSE_FETCH_STATUS_VOTE: case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES:

1 0