- tor-commits - lists.torproject.org

[arm/master] Adding a dialog for showing usage stats
by atagar＠torproject.org 17 Aug '11

17 Aug '11

commit 4e61f4660c8c5bd5b5fa8a045dd2a39deada65cc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 17 10:16:13 2011 -0700 Adding a dialog for showing usage stats Dialog is enabled for bridges, guards, and exits to show client locale and exit port usage statistics. --- README | 1 + src/cli/connections/__init__.py | 2 +- src/cli/connections/connPanel.py | 74 ++++++++++++++++++++++++++++++- src/cli/connections/countPopup.py | 86 +++++++++++++++++++++++++++++++++++++ 4 files changed, 159 insertions(+), 4 deletions(-) diff --git a/README b/README index 119d24e..cbaf31a 100644 --- a/README +++ b/README @@ -174,6 +174,7 @@ Layout: connPanel.py - (page 2) lists the active tor connections circEntry.py - circuit entries in the connection panel connEntry.py - individual connections to or from the system + countPopup.py - displays client locale or exit port counts descriptorPopup.py - displays raw descriptor and consensus entries entries.py - common parent for connPanel display entries diff --git a/src/cli/connections/__init__.py b/src/cli/connections/__init__.py index 0f29d23..abd3410 100644 --- a/src/cli/connections/__init__.py +++ b/src/cli/connections/__init__.py @@ -2,5 +2,5 @@ Connection panel related resources. """ -__all__ = ["circEntry", "connEntry", "connPanel", "descriptorPopup", "entries"] +__all__ = ["circEntry", "connEntry", "connPanel", "countPopup", "descriptorPopup", "entries"] diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 923902c..9745176 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -2,13 +2,14 @@ Listing of the currently established connections tor has made. """ +import re import time import curses import threading import cli.popups -from cli.connections import descriptorPopup, entries, connEntry, circEntry +from cli.connections import countPopup, descriptorPopup, entries, connEntry, circEntry from util import connections, enum, panel, torTools, uiTools DEFAULT_CONFIG = {"features.connection.resolveApps": True, @@ -68,6 +69,32 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._cond = threading.Condition() # used for pausing the thread self.valsLock = threading.RLock() + # Tracks exiting port and client country statistics + self._clientLocaleUsage = {} + self._exitPortUsage = {} + + # If we're a bridge and been running over a day then prepopulates with the + # last day's clients. + + conn = torTools.getConn() + bridgeClients = conn.getInfo("status/clients-seen") + + if bridgeClients: + # Response has a couple arguments... + # TimeStarted="2011-08-17 15:50:49" CountrySummary=us=16,de=8,uk=8 + + countrySummary = None + for arg in bridgeClients.split(): + if arg.startswith("CountrySummary="): + countrySummary = arg[15:] + break + + if countrySummary: + for entry in countrySummary.split(","): + if re.match("^..=[0-9]+$", entry): + locale, count = entry.split("=", 1) + self._clientLocaleUsage[locale] = int(count) + # Last sampling received from the ConnectionResolver, used to detect when # it changes. self._lastResourceFetch = -1 @@ -84,7 +111,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): entry.getLines()[0].isInitialConnection = True # listens for when tor stops so we know to stop reflecting changes - torTools.getConn().addStatusListener(self.torStateListener) + conn.addStatusListener(self.torStateListener) def torStateListener(self, conn, eventType): """ @@ -155,6 +182,22 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.valsLock.release() + def isClientsAllowed(self): + """ + True if client connections are permissable, false otherwise. + """ + + conn = torTools.getConn() + return "Guard" in conn.getMyFlags([]) or conn.getOption("BridgeRelay") == "1" + + def isExitsAllowed(self): + """ + True if exit connections are permissable, false otherwise. + """ + + policy = torTools.getConn().getExitPolicy() + return policy and policy.isExitingAllowed() + def showSortDialog(self): """ Provides the sort dialog for our connections. @@ -214,6 +257,10 @@ class ConnectionPanel(panel.Panel, threading.Thread): elif key == ord('d') or key == ord('D'): # presents popup for raw consensus data descriptorPopup.showDescriptorPopup(self) + elif (key == ord('c') or key == ord('C')) and self.isClientsAllowed(): + countPopup.showCountDialog(countPopup.CountType.CLIENT_LOCALE, self._clientLocaleUsage) + elif (key == ord('e') or key == ord('E')) and self.isExitsAllowed(): + countPopup.showCountDialog(countPopup.CountType.EXIT_PORT, self._exitPortUsage) else: isKeystrokeConsumed = False self.valsLock.release() @@ -263,6 +310,13 @@ class ConnectionPanel(panel.Panel, threading.Thread): options.append(("page down", "scroll down a page", None)) options.append(("enter", "edit configuration option", None)) options.append(("d", "raw consensus descriptor", None)) + + if self.isClientsAllowed(): + options.append(("c", "client locale usage summary", None)) + + if self.isExitsAllowed(): + options.append(("e", "exit port usage summary", None)) + options.append(("l", "listed identity", self._listingType.lower())) options.append(("s", "sort ordering", None)) options.append(("u", "resolving utility", resolverUtil)) @@ -411,8 +465,22 @@ class ConnectionPanel(panel.Panel, threading.Thread): # Adds any new connection and circuit entries. for lIp, lPort, fIp, fPort in newConnections: newConnEntry = connEntry.ConnectionEntry(lIp, lPort, fIp, fPort) - if newConnEntry.getLines()[0].getType() != connEntry.Category.CIRCUIT: + newConnLine = newConnEntry.getLines()[0] + + if newConnLine.getType() != connEntry.Category.CIRCUIT: newEntries.append(newConnEntry) + + # updates exit port and client locale usage information + if newConnLine.isPrivate(): + if newConnLine.getType() == connEntry.Category.INBOUND: + # client connection, update locale information + clientLocale = newConnLine.foreign.getLocale() + + if clientLocale: + self._clientLocaleUsage[clientLocale] = self._clientLocaleUsage.get(clientLocale, 0) + 1 + elif newConnLine.getType() == connEntry.Category.EXIT: + exitPort = newConnLine.foreign.getPort() + self._exitPortUsage[exitPort] = self._exitPortUsage.get(exitPort, 0) + 1 for circuitID in newCircuits: status, purpose, path = newCircuits[circuitID] diff --git a/src/cli/connections/countPopup.py b/src/cli/connections/countPopup.py new file mode 100644 index 0000000..341087f --- /dev/null +++ b/src/cli/connections/countPopup.py @@ -0,0 +1,86 @@ +""" +Provides a dialog with client locale or exiting port counts. +""" + +import curses +import operator + +import cli.controller +import cli.popups + +from util import enum, log, uiTools + +CountType = enum.Enum("CLIENT_LOCALE", "EXIT_PORT") + +def showCountDialog(countType, counts): + """ + Provides a dialog with bar graphs and percentages for the given set of + counts. Pressing any key closes the dialog. + + Arguments: + countType - type of counts being presented + counts - mapping of labels to counts + """ + + isNoStats = not counts + noStatsMsg = "Usage stats aren't available yet, press any key..." + + if isNoStats: + popup, width, height = cli.popups.init(3, len(noStatsMsg) + 4) + else: + popup, width, height = cli.popups.init(4 + max(1, len(counts)), 80) + if not popup: return + + try: + control = cli.controller.getController() + + popup.win.box() + + # dialog title + if countType == CountType.CLIENT_LOCALE: + title = "Client Locales" + elif countType == CountType.EXIT_PORT: + title = "Exiting Port Usage" + else: + title = "" + log.log(log.WARN, "Unrecognized count type: %s" % countType) + + popup.addstr(0, 0, title, curses.A_STANDOUT) + + if isNoStats: + popup.addstr(1, 2, noStatsMsg, curses.A_BOLD | uiTools.getColor("cyan")) + else: + sortedCounts = sorted(counts.iteritems(), key=operator.itemgetter(1)) + sortedCounts.reverse() + + # constructs string formatting for the max key and value display width + keyWidth, valWidth, valueTotal = 3, 1, 0 + for k, v in sortedCounts: + keyWidth = max(keyWidth, len(k)) + valWidth = max(valWidth, len(str(v))) + valueTotal += v + + labelFormat = "%%-%is %%%ii (%%%%%%-2i)" % (keyWidth, valWidth) + + for i in range(height - 4): + k, v = sortedCounts[i] + label = labelFormat % (k, v, v * 100 / valueTotal) + popup.addstr(i + 1, 2, label, curses.A_BOLD | uiTools.getColor("green")) + + # All labels have the same size since they're based on the max widths. + # If this changes then this'll need to be the max label width. + labelWidth = len(label) + + # draws simple bar graph for percentages + fillWidth = v * (width - 4 - labelWidth) / valueTotal + for j in range(fillWidth): + popup.addstr(i + 1, 3 + labelWidth + j, " ", curses.A_STANDOUT | uiTools.getColor("red")) + + popup.addstr(height - 2, 2, "Press any key...") + + popup.win.refresh() + + curses.cbreak() + control.getScreen().getch() + finally: cli.popups.finalize() +

1 0

r24956: {website} Fix the tor browser images to be the correct scale and size, (in website/trunk: css images projects/en)
by Andrew Lewman 17 Aug '11

17 Aug '11

Author: phobos Date: 2011-08-17 16:55:15 +0000 (Wed, 17 Aug 2011) New Revision: 24956 Added: website/trunk/images/tbb-screenshot1.jpg website/trunk/images/tbb-screenshot2.jpg website/trunk/images/tbb-screenshot3a.jpg website/trunk/images/tbb-screenshot3b.jpg website/trunk/images/tbb-split-screenshot1.jpg website/trunk/images/tbb-split-screenshot2.jpg Modified: website/trunk/css/layout.css website/trunk/projects/en/torbrowser-split.wml website/trunk/projects/en/torbrowser.wml Log: Fix the tor browser images to be the correct scale and size, fixes ticket 2674. Thank to jeremy for fixing this. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-17 03:59:30 UTC (rev 24955) +++ website/trunk/css/layout.css 2011-08-17 16:55:15 UTC (rev 24956) @@ -226,7 +226,7 @@ width: 960px; } - #content img { max-width: 550px; } + #content img { max-width: 710px; } #breadcrumbs { padding: 0 0 10px 5px; } Added: website/trunk/images/tbb-screenshot1.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-screenshot1.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: website/trunk/images/tbb-screenshot2.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-screenshot2.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: website/trunk/images/tbb-screenshot3a.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-screenshot3a.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: website/trunk/images/tbb-screenshot3b.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-screenshot3b.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: website/trunk/images/tbb-split-screenshot1.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-split-screenshot1.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: website/trunk/images/tbb-split-screenshot2.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/tbb-split-screenshot2.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Modified: website/trunk/projects/en/torbrowser-split.wml =================================================================== --- website/trunk/projects/en/torbrowser-split.wml 2011-08-17 03:59:30 UTC (rev 24955) +++ website/trunk/projects/en/torbrowser-split.wml 2011-08-17 16:55:15 UTC (rev 24956) @@ -100,7 +100,7 @@ After you have downloaded all the files above, double click on the file with the icon of a box (1). - <img src="$(IMGROOT)/tbb-split-screenshot1.png" alt="Screenshot of starting extraction process"> + <img src="$(IMGROOT)/tbb-split-screenshot1.jpg" alt="Screenshot of starting extraction process"> Click on the button labelled Browse... (2) and select where you want to save the bundle then click OK (3). At least 50 MB free @@ -112,7 +112,7 @@ Click Install (4) to begin extraction. This may take a few minutes to complete. - <img src="$(IMGROOT)/tbb-split-screenshot2.png" alt="Screenshot of extraction process"> + <img src="$(IMGROOT)/tbb-split-screenshot2.jpg" alt="Screenshot of extraction process"> Once the extraction has completed, see the <a href="<page projects/torbrowser>#Usage">usage instructions</a> for how to start Tor. </div> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2011-08-17 03:59:30 UTC (rev 24955) +++ website/trunk/projects/en/torbrowser.wml 2011-08-17 16:55:15 UTC (rev 24956) @@ -220,7 +220,7 @@ Click Extract (3) to begin extraction. This may take a few minutes to complete. - <img src="$(IMGROOT)/tbb-screenshot1.png" alt="Screenshot of + <img src="$(IMGROOT)/tbb-screenshot1.jpg" alt="Screenshot of extraction process" /> <a id="Usage"></a> @@ -233,7 +233,7 @@ The Vidalia window will shortly appear. - <img src="$(IMGROOT)/tbb-screenshot2.png" alt="Screenshot of + <img src="$(IMGROOT)/tbb-screenshot2.jpg" alt="Screenshot of bundle startup" /> Once Tor is ready, Firefox will automatically be opened. Only web pages @@ -251,12 +251,12 @@ For privacy reasons, the list of webpages you visited and any cookies will be deleted. - <img src="$(IMGROOT)/tbb-screenshot3a.png" alt="Screenshot of + <img src="$(IMGROOT)/tbb-screenshot3a.jpg" alt="Screenshot of Firefox" /> With the Tor Browser Bundle, Vidalia and Tor will automatically close. With the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on the Pidgin icon (7), and choosing Quit (8). - <img src="$(IMGROOT)/tbb-screenshot3b.png" alt="Screenshot of + <img src="$(IMGROOT)/tbb-screenshot3b.jpg" alt="Screenshot of Pidgin" /> To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the steps in <a href="#Usage">"Usage"</a>.

1 0

[torouter/master] Add support for displaying content of torrc file
by hellais＠torproject.org 17 Aug '11

17 Aug '11

commit d435505bea5b9d735447f4900d7e502cae11412f Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 18:16:22 2011 +0200 Add support for displaying content of torrc file --- packages/torouter-web/config.py | 1 + packages/torouter-web/runui.py | 2 +- packages/torouter-web/static/main.css | 14 ++++++++++++++ packages/torouter-web/tui/controllers/tor.py | 14 ++++++++++---- packages/torouter-web/tui/utils/parsing.py | 21 +++++++++++++++++++++ packages/torouter-web/tui/views/torstatus.html | 4 +++- 6 files changed, 50 insertions(+), 6 deletions(-) diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index 8fd716d..15057df 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -12,4 +12,5 @@ globals = {} authinfo = ("test", "test") interfaces_file = os.getcwd() + "/../torouter-prep/configs/interfaces" +torrc_file = os.getcwd() + "/../torouter-prep/configs/torrc" diff --git a/packages/torouter-web/runui.py b/packages/torouter-web/runui.py index 3d2dfc8..80836b3 100644 --- a/packages/torouter-web/runui.py +++ b/packages/torouter-web/runui.py @@ -20,7 +20,7 @@ urls = ( '/network/wired', 'tui.controllers.network.wired', '/network/status', 'tui.controllers.network.status', '/tor', 'tui.controllers.tor.status', - '/tor/config', 'tui.controllers.tor.config', + '/tor/config', 'tui.controllers.tor.torrc', '/logout', 'tui.controllers.main.logout' ) # '/wizard/([0-9a-f]{1,2})?', 'tui.controllers.wizard.step', diff --git a/packages/torouter-web/static/main.css b/packages/torouter-web/static/main.css index 5626e92..34e26cf 100644 --- a/packages/torouter-web/static/main.css +++ b/packages/torouter-web/static/main.css @@ -35,3 +35,17 @@ div.header ul#submenu li { font-size: 15px; } +/* More specific stuff */ +#torrc { +list-style: none; +line-height: 2em; +} + +#torrc em { +font-weight: bold; +font-style: normal; +} + + + + diff --git a/packages/torouter-web/tui/controllers/tor.py b/packages/torouter-web/tui/controllers/tor.py index d07cb71..af8678c 100644 --- a/packages/torouter-web/tui/controllers/tor.py +++ b/packages/torouter-web/tui/controllers/tor.py @@ -1,22 +1,28 @@ import web import view, config from view import render -from tui.utils import session +from tui.utils import session, parsing """ The main Tor status page """ class status: def GET(self): - return render.base(render.torstatus()) + trc = parsing.torrc(config.torrc_file) + trc.parse() + output = trc.html_output() + return render.base(render.torstatus(output,config.torrc_file)) def POST(self): - return render.base(render.torstatus()) + trc = parsing.torrc(config.torrc_file) + trc.parse() + output = trc.html_output() + return render.base(render.torstatus(output,config.torrc_file)) """ Tor configuration page """ -class config: +class torrc: def update_config(self, data): return True diff --git a/packages/torouter-web/tui/utils/parsing.py b/packages/torouter-web/tui/utils/parsing.py index e9ccc83..6acf988 100644 --- a/packages/torouter-web/tui/utils/parsing.py +++ b/packages/torouter-web/tui/utils/parsing.py @@ -74,6 +74,27 @@ class interfaces: else: print "%s %s" % (item[0],item[1]) +class torrc: + def __init__(self,filename): + self.fp = open(filename, "r") + self.parsed = [] + + def parse(self): + for line in self.fp.readlines(): + if line.startswith("#") or line == "": + continue + else: + self.parsed.append(line) + + def html_output(self): + output = "<ul id=\"torrc\">" + for line in self.parsed: + if line != "\n": + output += "<li>%s %s</li>" % (line.split(" ")[0], " ".join(line.split(" ")[1:])) + output += "</ul>" + print output + return output + #interfaces_file = os.getcwd() + "/../../../torouter-prep/configs/interfaces" #itfc = interfaces(interfaces_file) #itfc.parse() diff --git a/packages/torouter-web/tui/views/torstatus.html b/packages/torouter-web/tui/views/torstatus.html index ed83531..27b2888 100644 --- a/packages/torouter-web/tui/views/torstatus.html +++ b/packages/torouter-web/tui/views/torstatus.html @@ -1 +1,3 @@ -The main Tor status page +$def with (content, torrc) +<h2>This is the content of $:torrc</h2> +$:content

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 17 Aug '11

17 Aug '11

commit 525766e515148f9da5e78d39d1905264a4d14bad Merge: d435505 24b92ab Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Aug 17 18:16:55 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/Makefile | 9 +++++++++ packages/torouter-prep/configs/hostname | 1 + packages/torouter-prep/configs/hosts | 1 + packages/torouter-prep/debian/changelog | 2 +- packages/torouter-prep/debian/control | 2 +- packages/torouter-prep/debian/files | 2 +- packages/torouter-prep/src/torouter_config.sh | 3 ++- 7 files changed, 16 insertions(+), 4 deletions(-)

1 0

[torouter/master] update package and src
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit 6c11bb24e348d12cd12516f2f90241cb29387a5d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:45:46 2011 +0200 update package and src --- packages/torouter-prep/debian/changelog | 2 +- packages/torouter-prep/debian/files | 2 +- packages/torouter-prep/src/torouter_config.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/torouter-prep/debian/changelog b/packages/torouter-prep/debian/changelog index f62a4bb..14ff45a 100644 --- a/packages/torouter-prep/debian/changelog +++ b/packages/torouter-prep/debian/changelog @@ -1,4 +1,4 @@ -torouter (0.0.1-1) unstable; urgency=low +torouter-prep (0.0.1-1) unstable; urgency=low * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> diff --git a/packages/torouter-prep/debian/files b/packages/torouter-prep/debian/files index 894b9ed..298935e 100644 --- a/packages/torouter-prep/debian/files +++ b/packages/torouter-prep/debian/files @@ -1 +1 @@ -torouter_0.0.1-1_all.deb unknown extra +torouter-prep_0.0.1-1_all.deb unknown extra diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 7a6a581..7c79862 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -6,6 +6,7 @@ echo "This is where we'd take over the entire Torouter system" # For every file we touch, move it to the temp_dir and then tar it up in the end temp_dir="`mktemp -d`" +config_dir="/usr/share/doc/torouter-prep/example-configs/" # Add a user ADMINUSER="toradmin" @@ -23,7 +24,7 @@ EOF cp /etc/hostname $temp_dir/ # Set us to have a default host name -echo "torouter" > /etc/hostname +cp /usr/share/doc/ # We need to prep apt to understand that we want packages from other repos # We append to the current package list

1 0

[torouter/master] add two new configs
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit 790e0771d7b908d235ea0379c58594bb027924fc Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:46:05 2011 +0200 add two new configs --- packages/torouter-prep/configs/hostname | 1 + packages/torouter-prep/configs/hosts | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/hostname b/packages/torouter-prep/configs/hostname new file mode 100644 index 0000000..a4a2962 --- /dev/null +++ b/packages/torouter-prep/configs/hostname @@ -0,0 +1 @@ +torouter diff --git a/packages/torouter-prep/configs/hosts b/packages/torouter-prep/configs/hosts new file mode 100644 index 0000000..64f3fc1 --- /dev/null +++ b/packages/torouter-prep/configs/hosts @@ -0,0 +1 @@ + 127.0.0.1 localhost

1 0

[torouter/master] add modified control
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit e5dbdcb4bbe43a9f652a045f8dcf0b092b11eba0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:59:17 2011 +0200 add modified control --- packages/torouter-prep/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/debian/control b/packages/torouter-prep/debian/control index f9930d6..545c9f9 100644 --- a/packages/torouter-prep/debian/control +++ b/packages/torouter-prep/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.9.1 Homepage: <https://www.torproject.org/> -Package: torouter +Package: torouter-prep Architecture: all Depends: ${misc:Depends}, apt-utils, openssh-server, isc-dhcp-client, cron-apt Description: Torouter meta-package to take over the DreamPlug

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit 24b92ab9b034d6c957631a034a717ba41809a335 Merge: e5dbdcb ed08b56 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:59:37 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/config.py | 2 + packages/torouter-web/tui/controllers/network.py | 10 ++++++- packages/torouter-web/tui/utils/parsing.py | 27 +++++++++++++++++---- packages/torouter-web/tui/views/status.html | 4 ++- 4 files changed, 35 insertions(+), 8 deletions(-)

1 0

[torouter/master] Add basic Makefile to make packages without signatures
by ioerror＠torproject.org 17 Aug '11

17 Aug '11

commit a944bcefad1737cac6d307dc9b065f49615aea42 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Aug 17 17:45:14 2011 +0200 Add basic Makefile to make packages without signatures --- packages/Makefile | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/packages/Makefile b/packages/Makefile new file mode 100644 index 0000000..6166493 --- /dev/null +++ b/packages/Makefile @@ -0,0 +1,9 @@ +debs: webdeb prepdeb + +webdeb: + # By default we will but not sign for now + cd torouter-web && debuild --no-tgz-check -us -uc +prepdeb: + # By default we will but not sign for now + cd torouter-prep && debuild --no-tgz-check -us -uc +

1 0

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

17 Aug '11

commit 06be6105e45eca8ce3ad24e58652ad3faa083c92 Merge: 14552a1 d79d648 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 12:00:44 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/config.c changes/bug3747 | 6 ++++++ src/or/config.c | 3 +++ src/or/connection.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --cc src/or/config.c index 315884c,7202ea2..716d83a --- a/src/or/config.c +++ b/src/or/config.c @@@ -1120,7 -1034,10 +1120,10 @@@ options_act_reversible(const or_options /* No need to roll back, since you can't change the value. */ } + /* Write control ports to disk as appropriate */ + control_ports_write_to_file(); + - if (directory_caches_v2_dir_info(options)) { + if (directory_caches_v2_dir_info(options)) { size_t len = strlen(options->DataDirectory)+32; char *fn = tor_malloc(len); tor_snprintf(fn, len, "%s"PATH_SEPARATOR"cached-status",

1 0