January 2013 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Jan '13

17 Jan '13

commit 573eb6fcfd9b0dec90cddcbdcc4be2eae51b553a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 09:45:06 2013 +0000 Update translations for gettor --- es/gettor.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index 0a7150d..a897df2 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2013-01-17 03:22+0000\n" +"PO-Revision-Date: 2013-01-17 09:24+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[metrics-web/master] Add table of top-10 countries by bridge users.
by karsten＠torproject.org 17 Jan '13

17 Jan '13

commit 3b35f9b2e3a42b048761f31d00342808bd43c836 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 17 09:18:33 2013 +0100 Add table of top-10 countries by bridge users. Implements #7973. --- rserve/tables.R | 24 +++++++++++++++ .../ernie/web/graphs/GraphsSubpagesServlet.java | 2 +- .../ernie/web/graphs/RObjectGenerator.java | 1 + web/WEB-INF/users.jsp | 31 ++++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletions(-) diff --git a/rserve/tables.R b/rserve/tables.R index 47f1a29..eb8f676 100644 --- a/rserve/tables.R +++ b/rserve/tables.R @@ -68,3 +68,27 @@ write_censorship_events <- function(start, end, path) { write.csv(r, path, quote = FALSE, row.names = FALSE) } +write_bridge_users <- function(start, end, path) { + drv <- dbDriver("PostgreSQL") + con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) + q <- paste("SELECT date, country, users AS bridgeusers ", + "FROM bridge_stats WHERE date >= '", start, "' AND date <= '", end, + "' AND date < current_date - 3 ORDER BY date, country", sep = "") + rs <- dbSendQuery(con, q) + d <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + d <- aggregate(d$bridgeusers, by = list(country = d$country), mean) + total <- d[d$country == "zy", "x"] + d <- d[!(d$country %in% c("zy", "??", "a1", "a2", "o1", "ap", "eu")), ] + d <- data.frame(country = d$country, bridgeusers = d$x) + d <- d[order(d$bridgeusers, decreasing = TRUE), ] + d <- d[1:10, ] + d <- data.frame( + cc = as.character(d$country), + country = sub('the ', '', countrynames(as.character(d$country))), + abs = round(d$bridgeusers), + rel = round(100 * d$bridgeusers / total, 2)) + write.csv(d, path, quote = FALSE, row.names = FALSE) +} + diff --git a/src/org/torproject/ernie/web/graphs/GraphsSubpagesServlet.java b/src/org/torproject/ernie/web/graphs/GraphsSubpagesServlet.java index c522bfa..12a098d 100644 --- a/src/org/torproject/ernie/web/graphs/GraphsSubpagesServlet.java +++ b/src/org/torproject/ernie/web/graphs/GraphsSubpagesServlet.java @@ -51,7 +51,7 @@ public class GraphsSubpagesServlet extends HttpServlet { new HashMap<String, Set<String>>(); this.availableGraphsSubpageTables.put("users.html", new HashSet<String>(Arrays.asList( - "direct-users,censorship-events".split(",")))); + "direct-users,censorship-events,bridge-users".split(",")))); this.knownCountries = Countries.getInstance().getCountryList(); } diff --git a/src/org/torproject/ernie/web/graphs/RObjectGenerator.java b/src/org/torproject/ernie/web/graphs/RObjectGenerator.java index f678ff4..c4eb801 100644 --- a/src/org/torproject/ernie/web/graphs/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/graphs/RObjectGenerator.java @@ -78,6 +78,7 @@ public class RObjectGenerator implements ServletContextListener { this.availableTables = new HashMap<String, String>(); this.availableTables.put("direct-users", "start,end,filename"); this.availableTables.put("censorship-events", "start,end,filename"); + this.availableTables.put("bridge-users", "start,end,filename"); TableParameterChecker.getInstance().setAvailableTables( availableTables); diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index b7fdb13..d75bf7a 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -170,6 +170,37 @@ by a few hundred bridges.</p> <a href="bridge-users.pdf${bridge_users_url}">PDF</a> or <a href="bridge-users.svg${bridge_users_url}">SVG</a>.</p> <hr> +<a name="bridge-users-table"></a> +<p><b>Top-10 countries by bridge users:</b></p> +<form action="users.html#bridge-users-table"> + <div class="formrow"> + <input type="hidden" name="table" value="bridge-users"> + <p> + <label>Start date (yyyy-mm-dd):</label> + <input type="text" name="start" size="10" + value="<c:choose><c:when test="${fn:length(bridge_users_start) == 0}">${default_start_date}</c:when><c:otherwise>${bridge_users_start[0]}</c:otherwise></c:choose>"> + <label>End date (yyyy-mm-dd):</label> + <input type="text" name="end" size="10" + value="<c:choose><c:when test="${fn:length(bridge_users_end) == 0}">${default_end_date}</c:when><c:otherwise>${bridge_users_end[0]}</c:otherwise></c:choose>"> + </p><p> + <input class="submit" type="submit" value="Update table"> + </p> + </div> +</form> +<br> +<table> + <tr> + <th>Country</th> + <th>Mean daily users</th> + </tr> + <c:forEach var="row" items="${bridge_users_tabledata}"> + <tr> + <td><a href="users.html?graph=bridge-users&country=${row['cc']}#bridge-users">${row['country']}</a>&emsp;</td> + <td>${row['abs']} (<fmt:formatNumber type="number" minFractionDigits="2" value="${row['rel']}" /> %)</td> + </tr> + </c:forEach> +</table> +<hr> <p><a href="csv/bridge-users.csv">CSV</a> file containing all data.</p> <p><a href="csv/monthly-users-peak.csv">CSV</a> file containing peak daily Tor users (direct and bridge) per month by country.</p>

1 0

[arm/master] Change all camel_case() to to_camel_case()
by atagar＠torproject.org 17 Jan '13

17 Jan '13

commit 5b3906463c428647f621b65191e3be740b675494 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Jan 15 12:22:26 2013 +0530 Change all camel_case() to to_camel_case() --- src/cli/menu/actions.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index db2da5a..320373f 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -97,7 +97,7 @@ def makeViewMenu(): colorMenu.add(cli.menu.item.SelectionMenuItem("All", colorGroup, None)) for color in uiTools.COLOR_LIST: - colorMenu.add(cli.menu.item.SelectionMenuItem(str_tools.camel_case(color), colorGroup, color)) + colorMenu.add(cli.menu.item.SelectionMenuItem(str_tools.to_camel_case(color), colorGroup, color)) viewMenu.add(colorMenu) @@ -137,7 +137,7 @@ def makeGraphMenu(graphPanel): availableStats.sort() for statKey in ["None"] + availableStats: - label = str_tools.camel_case(statKey, divider = " ") + label = str_tools.to_camel_case(statKey, divider = " ") statKey = None if statKey == "None" else statKey graphMenu.add(cli.menu.item.SelectionMenuItem(label, statGroup, statKey)) @@ -150,7 +150,7 @@ def makeGraphMenu(graphPanel): for i in range(len(cli.graphing.graphPanel.UPDATE_INTERVALS)): label = cli.graphing.graphPanel.UPDATE_INTERVALS[i][0] - label = str_tools.camel_case(label, divider = " ") + label = str_tools.to_camel_case(label, divider = " ") intervalMenu.add(cli.menu.item.SelectionMenuItem(label, intervalGroup, i)) graphMenu.add(intervalMenu)

1 0

[arm/master] Fix AttributeError in makeViewMenu()
by atagar＠torproject.org 17 Jan '13

17 Jan '13

commit fedce45deaff6a98a54de5922b09ae6c78814146 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Jan 15 12:01:44 2013 +0530 Fix AttributeError in makeViewMenu() stem has to_camel_case() and not camel_case(), which was causing the attribute error. --- src/cli/menu/actions.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index 3cf7eb6..db2da5a 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -86,7 +86,7 @@ def makeViewMenu(): for i in range(control.getPageCount()): pagePanels = control.getDisplayPanels(pageNumber = i, includeSticky = False) - label = " / ".join([str_tools.camel_case(panel.getName()) for panel in pagePanels]) + label = " / ".join([str_tools.to_camel_case(panel.getName()) for panel in pagePanels]) viewMenu.add(cli.menu.item.SelectionMenuItem(label, pageGroup, i))

1 0

[torspec/master] Mark proposal 204 finished
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit 6dcfa055a58ed6c93e9407b7084d5bbe59c9b555 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 23:31:13 2013 -0500 Mark proposal 204 finished --- proposals/000-index.txt | 4 ++-- proposals/204-hidserv-subdomains.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index a6f1318..7677925 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -124,7 +124,7 @@ Proposals by number: 201 Make bridges report statistics on daily v3 network status requests [OPEN] 202 Two improved relay encryption protocols for Tor cells [OPEN] 203 Avoiding censorship by impersonating an HTTPS server [DRAFT] -204 Subdomain support for Hidden Service addresses [OPEN] +204 Subdomain support for Hidden Service addresses [FINISHED] 205 Remove global client-side DNS caching [CLOSED] 206 Preconfigured directory sources for bootstrapping [CLOSED] 207 Directory guards [CLOSED] @@ -177,7 +177,6 @@ Proposals by status: 199 Integration of BridgeFinder and BridgeFinderHelper [for 0.2.4.x+] 201 Make bridges report statistics on daily v3 network status requests [for 0.2.4.x] 202 Two improved relay encryption protocols for Tor cells - 204 Subdomain support for Hidden Service addresses 209 Tuning the Parameters for the Path Bias Defense [for 0.2.4.x+] 210 Faster Headless Consensus Bootstrapping [for 0.2.4.x+] 211 Internal Mapaddress for Tor Configuration Testing [for 0.2.4.x+] @@ -210,6 +209,7 @@ Proposals by status: 180 Pluggable transports for circumvention [in 0.2.3.x] 198 Restore semantics of TLS ClientHello [for 0.2.4.x] 200 Adding new, extensible CREATE, EXTEND, and related cells + 204 Subdomain support for Hidden Service addresses 208 IPv6 Exits Redux [for 0.2.4.x] [in 0.2.4.7-alpha] 216 Improved circuit-creation key exchange CLOSED: diff --git a/proposals/204-hidserv-subdomains.txt b/proposals/204-hidserv-subdomains.txt index 9c85e98..a732c39 100644 --- a/proposals/204-hidserv-subdomains.txt +++ b/proposals/204-hidserv-subdomains.txt @@ -2,7 +2,7 @@ Filename: 204-hidserv-subdomains.txt Title: Subdomain support for Hidden Service addresses Author: Alessandro Preite Martinez Created: 6 July 2012 -Status: Open +Status: Finished 1. Overview

1 0

[tor/master] Implement proposal 204: ignore subdomains in hidden service addresses
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit aa01d0a18337787209241d08a630a2d8c10f29f0 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Fri Jul 6 15:31:47 2012 +0200 Implement proposal 204: ignore subdomains in hidden service addresses The implementation is pretty straightforward: parse_extended_hostname() is modified to drop any leading components from an address like 'foo.aaaaaaaaaaaaaaaa.onion'. --- changes/proposal204 | 5 +++++ src/or/connection_edge.c | 15 ++++++++++++++- src/test/test.c | 9 +++++++++ 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/changes/proposal204 b/changes/proposal204 new file mode 100644 index 0000000..4c1854b --- /dev/null +++ b/changes/proposal204 @@ -0,0 +1,5 @@ + o Minor features: + - Ignore sub-domain components of a .onion address. This makes HTTP "virtual" + hosting possible: http://foo.aaaaaaaaaaaaaaaa.onion/ and + http//bar.aaaaaaaaaaaaaaaa.onion/ can be two different websites hosted at + the same location. Implements proposal 204. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index a68a5cf..870ded9 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2813,6 +2813,9 @@ connection_ap_can_use_exit(const entry_connection_t *conn, const node_t *exit) /** If address is of the form "y.onion" with a well-formed handle y: * Put a NUL after y, lower-case it, and return ONION_HOSTNAME. * + * If address is of the form "x.y.onion" with a well-formed handle x: + * Drop "x.", put a NUL after y, lower-case it, and return ONION_HOSTNAME. + * * If address is of the form "y.onion" with a badly-formed handle y: * Return BAD_HOSTNAME and log a message. * @@ -2826,6 +2829,7 @@ hostname_type_t parse_extended_hostname(char *address) { char *s; + char *q; char query[REND_SERVICE_ID_LEN_BASE32+1]; s = strrchr(address,'.'); @@ -2840,9 +2844,18 @@ parse_extended_hostname(char *address) /* so it is .onion */ *s = 0; /* NUL-terminate it */ - if (strlcpy(query, address, REND_SERVICE_ID_LEN_BASE32+1) >= + /* locate a 'sub-domain' component, in order to remove it */ + q = strrchr(address, '.'); + if (q == address) { + goto failed; /* reject sub-domain, as DNS does */ + } + q = (NULL == q) ? address : q + 1; + if (strlcpy(query, q, REND_SERVICE_ID_LEN_BASE32+1) >= REND_SERVICE_ID_LEN_BASE32+1) goto failed; + if (q != address) { + memmove(address, q, strlen(q) + 1 /* also get \0 */); + } if (rend_valid_service_id(query)) { return ONION_HOSTNAME; /* success */ } diff --git a/src/test/test.c b/src/test/test.c index c219d98..e3e989b 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1412,11 +1412,20 @@ test_rend_fns(void) char address2[] = "aaaaaaaaaaaaaaaa.onion"; char address3[] = "fooaddress.exit"; char address4[] = "www.torproject.org"; + char address5[] = "foo.abcdefghijklmnop.onion"; + char address6[] = "foo.bar.abcdefghijklmnop.onion"; + char address7[] = ".abcdefghijklmnop.onion"; test_assert(BAD_HOSTNAME == parse_extended_hostname(address1)); test_assert(ONION_HOSTNAME == parse_extended_hostname(address2)); + test_streq(address2, "aaaaaaaaaaaaaaaa"); test_assert(EXIT_HOSTNAME == parse_extended_hostname(address3)); test_assert(NORMAL_HOSTNAME == parse_extended_hostname(address4)); + test_assert(ONION_HOSTNAME == parse_extended_hostname(address5)); + test_streq(address5, "abcdefghijklmnop"); + test_assert(ONION_HOSTNAME == parse_extended_hostname(address6)); + test_streq(address6, "abcdefghijklmnop"); + test_assert(BAD_HOSTNAME == parse_extended_hostname(address7)); pk1 = pk_generate(0); pk2 = pk_generate(1);

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 17 Jan '13

17 Jan '13

commit 2018733f8833657c9ddc20a0814452dd60b1d14e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 03:45:07 2013 +0000 Update translations for gettor_completed --- es/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index c0166bb..0a7150d 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2013-01-17 03:13+0000\n" +"PO-Revision-Date: 2013-01-17 03:22+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "Le enviaré un paquete de Tor por correo si me indica cuál quiere.\nPor msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "Por favor, responda a este correo, y mencione un sólo\nnombre de paquete en cualquier parte del cuerpo del correo." +msgstr "Por favor, responda a este correo y mencione un sólo\nnombre de paquete en cualquier parte del cuerpo del correo." #: lib/gettor/i18n.py:59 msgid "" @@ -299,7 +299,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "Desafortunadamente no hay archivo fraccionado disponible del paquete\nque ha solicitado. Por favor, envíenos otro nombre de paquete o solicite\notra vez el mismo eliminando la palabra 'split' y en tal caso le enviaremos\nel paquete completo. Asegúrese antes de que esto es lo que quiere." +msgstr "Desafortunadamente no hay archivo fraccionado disponible del paquete\nque ha solicitado. Por favor, envíenos otro nombre de paquete o solicite\notra vez el mismo eliminando la palabra 'split' y en tal caso le enviaremos\nel paquete completo. Antes asegúrese de que esto es lo que quiere." #: lib/gettor/i18n.py:193 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 17 Jan '13

17 Jan '13

commit eb9cf59bf6f98122c7c85a30381f4fb0ca9f18b2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 03:45:05 2013 +0000 Update translations for gettor --- es/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index c0166bb..0a7150d 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2013-01-17 03:13+0000\n" +"PO-Revision-Date: 2013-01-17 03:22+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "Le enviaré un paquete de Tor por correo si me indica cuál quiere.\nPor msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "Por favor, responda a este correo, y mencione un sólo\nnombre de paquete en cualquier parte del cuerpo del correo." +msgstr "Por favor, responda a este correo y mencione un sólo\nnombre de paquete en cualquier parte del cuerpo del correo." #: lib/gettor/i18n.py:59 msgid "" @@ -299,7 +299,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "Desafortunadamente no hay archivo fraccionado disponible del paquete\nque ha solicitado. Por favor, envíenos otro nombre de paquete o solicite\notra vez el mismo eliminando la palabra 'split' y en tal caso le enviaremos\nel paquete completo. Asegúrese antes de que esto es lo que quiere." +msgstr "Desafortunadamente no hay archivo fraccionado disponible del paquete\nque ha solicitado. Por favor, envíenos otro nombre de paquete o solicite\notra vez el mismo eliminando la palabra 'split' y en tal caso le enviaremos\nel paquete completo. Antes asegúrese de que esto es lo que quiere." #: lib/gettor/i18n.py:193 msgid ""

1 0

[tor/master] Add clean target and test subdir to makefile.nmake
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit ce2513abb8a7deeeea3e7b9450485b934d82c666 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:24:19 2012 -0500 Add clean target and test subdir to makefile.nmake --- Makefile.nmake | 10 ++++++++++ src/common/Makefile.nmake | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Makefile.nmake b/Makefile.nmake index 425f1ec..a0a11eb 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -3,3 +3,13 @@ all: $(MAKE) /F Makefile.nmake cd ../../src/or $(MAKE) /F Makefile.nmake + cd ../../src/test + $(MAKE) /F Makefile.nmake + +clean: + cd src/common + $(MAKE) /F Makefile.nmake clean + cd ../../src/or + $(MAKE) /F Makefile.nmake clean + cd ../../src/test + $(MAKE) /F Makefile.nmake clean diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake index 55923d2..9672f4f 100644 --- a/src/common/Makefile.nmake +++ b/src/common/Makefile.nmake @@ -18,3 +18,6 @@ libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS) libor-event.lib: $(LIBOR_EVENT_OBJECTS) lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib + +clean: + del *.obj *.lib libor*.lib

1 0

[tor/master] Add missing objects to Makefile.nmake
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit fb497dfe9eecafdab149a53f1b7fdd8a1d3a76a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:20:32 2012 -0500 Add missing objects to Makefile.nmake --- src/or/Makefile.nmake | 59 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 9 deletions(-) diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index 71d18c1..568c745 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -9,15 +9,56 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \ ..\..\..\build-alpha\lib\libz.lib \ ws2_32.lib advapi32.lib shell32.lib -LIBTOR_OBJECTS = buffers.obj channel.obj channeltls.obj circuitbuild.obj \ - circuitlist.obj circuitmux.obj circuitmux_ewma.obj circuituse.obj \ - command.obj config.obj connection.obj connection_edge.obj \ - connection_or.obj control.obj cpuworker.obj directory.obj \ - dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj hibernate.obj \ - main.obj microdesc.obj networkstatus.obj nodelist.obj onion.obj \ - policies.obj reasons.obj relay.obj rendclient.obj rendcommon.obj \ - rendmid.obj rendservice.obj rephist.obj router.obj routerlist.obj \ - routerparse.obj status.obj config_codedigest.obj ntmain.obj +LIBTOR_OBJECTS = \ + addressmap.obj \ + buffers.obj \ + channel.obj \ + channeltls.obj \ + circuitbuild.obj \ + circuitlist.obj \ + circuitmux.obj \ + circuitmux_ewma.obj \ + circuitstats.obj \ + circuituse.obj \ + command.obj \ + config.obj \ + config_codedigest.obj \ + confparse.obj \ + connection.obj \ + connection_edge.obj \ + connection_or.obj \ + control.obj \ + cpuworker.obj \ + directory.obj \ + dirserv.obj \ + dirvote.obj \ + dns.obj \ + dnsserv.obj \ + entrynodes.obj \ + geoip.obj \ + hibernate.obj \ + main.obj \ + microdesc.obj \ + networkstatus.obj \ + nodelist.obj \ + ntmain.obj \ + onion.obj \ + policies.obj \ + reasons.obj \ + relay.obj \ + rendclient.obj \ + rendcommon.obj \ + rendmid.obj \ + rendservice.obj \ + rephist.obj \ + replaycache.obj \ + router.obj \ + routerlist.obj \ + routerparse.obj \ + routerset.obj \ + statefile.obj \ + status.obj \ + transports.obj libtor.lib: $(LIBTOR_OBJECTS) lib $(LIBTOR_OBJECTS) /out:libtor.lib

1 0