July 2018 - tor-commits - lists.torproject.org

[metrics-web/master] Makes flags in details view clickable
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 12d98872c6aaf03f21726bedcd712373359fd807 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Jul 9 13:06:23 2018 +0100 Makes flags in details view clickable Fixes: #25533 --- src/main/resources/web/templates/rs/details/bridge.html | 2 +- src/main/resources/web/templates/rs/details/router.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/web/templates/rs/details/bridge.html b/src/main/resources/web/templates/rs/details/bridge.html index 6eb7dcf..05f4d7b 100644 --- a/src/main/resources/web/templates/rs/details/bridge.html +++ b/src/main/resources/web/templates/rs/details/bridge.html @@ -51,7 +51,7 @@ <dd><% _.each(relay.get('flags'), function(flag) { %> <span class="tip flags" title="<%= flag[2] %>"> <img class="inline" alt="" src="/images/flags/<%= flag[1] %>.png"/> - <span class="inline"><%= flag[0] %></span> + <a href="#search/flag:<%= flag[1] %>"><span class="inline"><%= flag[0] %></span></a> </span> <% }); %> </dd> diff --git a/src/main/resources/web/templates/rs/details/router.html b/src/main/resources/web/templates/rs/details/router.html index e1ffe37..29924cf 100644 --- a/src/main/resources/web/templates/rs/details/router.html +++ b/src/main/resources/web/templates/rs/details/router.html @@ -126,7 +126,7 @@ should update it as soon as possible.</div> <dd><% _.each(relay.get('flags'), function(flag) { %> <span class="tip flags" title="<%= flag[2] %>"> <img class="inline" alt="" src="/images/flags/<%= flag[1] %>.png"/> - <span class="inline"><%= flag[0] %></span> + <a href="#search/flag:<%= flag[1] %>"><span class="inline"><%= flag[0] %></span></a> </span> <% }); %> </dd>

1 0

[metrics-web/master] More intuitive sorting for aggregated AS/countries
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 8e0953f130018a32f3a7295e264a8afcc5dcdb38 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Jul 9 13:53:59 2018 +0100 More intuitive sorting for aggregated AS/countries Fixes: #25242 --- .../web/templates/rs/aggregate/search.html | 28 ++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/resources/web/templates/rs/aggregate/search.html b/src/main/resources/web/templates/rs/aggregate/search.html index 9a6b6c5..5775057 100644 --- a/src/main/resources/web/templates/rs/aggregate/search.html +++ b/src/main/resources/web/templates/rs/aggregate/search.html @@ -62,28 +62,36 @@ <%= aggregate.version %> </td> <% } %> - <td> <% if ((typeof aggregate.country) == "string") { %> - <a href="#search/<%= (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %><% if (query.indexOf("country:") == -1) { %>country:<%= aggregate.country %><% } %>"><img class="inline country" src="/images/cc/<%= aggregate.country %>.png"> <%= countries[aggregate.country] %></a> + <td data-order="0000000001<%= countries[aggregate.country] %>"> + <a href="#search/<%= (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %><% if (query.indexOf("country:") == -1) { %>country:<%= aggregate.country %><% } %>"><img class="inline country" src="/images/cc/<%= aggregate.country %>.png"> <%= countries[aggregate.country] %></a> + </td> <% } else { %> <% if ((typeof aggregate.as) == "string") { %> - (<a href="#aggregate/ascc/<%= (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %><% if (query.indexOf("as:") == -1) { %>as:<%= aggregate.as %><% } %>"><%= aggregate.country.size %> distinct</a>) + <td data-order="<%= aggregate.country.size.toString().padStart(10, "0") %>"> + (<a href="#aggregate/ascc/<%= (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %><% if (query.indexOf("as:") == -1) { %>as:<%= aggregate.as %><% } %>"><%= aggregate.country.size %> distinct</a>) + </td> <% } else { %> - (<a href="#aggregate/cc<%= (query || aggregate.version) ? "/" : "" %><% (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %>"><%= aggregate.country.size %> distinct</a>) + <td data-order="<%= aggregate.country.size.toString().padStart(10, "0") %>"> + (<a href="#aggregate/cc<%= (query || aggregate.version) ? "/" : "" %><% (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %>"><%= aggregate.country.size %> distinct</a>) + </td> <% } %> <% } %> - </td> - <td> <% if ((typeof aggregate.as) == "string") { %> - <a href="#search/<%= (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %><% if (query.indexOf("as:") == -1) { %>as:<%= aggregate.as %><% } %>"><%= aggregate.as_name %> (<%= aggregate.as %>)</a> + <td data-order="0000000001<%= aggregate.as_name %>"> + <a href="#search/<%= (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %><% if (query.indexOf("as:") == -1) { %>as:<%= aggregate.as %><% } %>"><%= aggregate.as_name %> (<%= aggregate.as %>)</a> + </td> <% } else { %> <% if ((typeof aggregate.country) == "string") { %> - (<a href="#aggregate/ascc/<%= (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %><% if (query.indexOf("country:") == -1) { %>country:<%= aggregate.country %><% } %>"><%= aggregate.as.size %> distinct</a>) + <td data-order="<%= aggregate.as.size.toString().padStart(10, "0") %>"> + (<a href="#aggregate/ascc/<%= (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %><% if (query.indexOf("country:") == -1) { %>country:<%= aggregate.country %><% } %>"><%= aggregate.as.size %> distinct</a>) + </td> <% } else { %> - (<a href="#aggregate/as<%= (query || aggregate.version) ? "/" : "" %><% (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %>"><%= aggregate.as.size %> distinct</a>) + <td data-order="<%= aggregate.as.size.toString().padStart(10, "0") %>"> + (<a href="#aggregate/as<%= (query || aggregate.version) ? "/" : "" %><% (query) ? query + " " : "" %><%= (aggregate.version) ? "version:" + aggregate.version + " " : "" %>"><%= aggregate.as.size %> distinct</a>) + </td> <% } %> <% } %> - </td> <td data-order="<%= aggregate.consensus_weight_fraction %>"><span class="tip" title="<%= aggregate.consensus_weight %>"><%= (aggregate.consensus_weight_fraction * 100).toFixed(4) %>%</span></td> <td data-order="<%= aggregate.advertised_bandwidth %>"><%= hrBandwidth(aggregate.advertised_bandwidth) %></span></td> <td data-order="<%= aggregate.guard_probability %>"><%= (aggregate.guard_probability * 100).toFixed(4) %>%</td>

1 0

[metrics-web/master] Link country name in details to search for country
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 194db287c1e985c0b58984a572fb9904465ba9dc Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Jul 9 12:49:02 2018 +0100 Link country name in details to search for country Additionally, a link to search for all exits in a country is displayed next to the country name. Fixes: #25861 --- src/main/resources/web/templates/rs/details/router.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/templates/rs/details/router.html b/src/main/resources/web/templates/rs/details/router.html index c5ff77f..e1ffe37 100644 --- a/src/main/resources/web/templates/rs/details/router.html +++ b/src/main/resources/web/templates/rs/details/router.html @@ -148,7 +148,7 @@ should update it as soon as possible.</div> <dd><% if (relay.get('host_name')) { %><%= relay.get('host_name') %><% } else { %>No PTR record found<% } %></dd> <dt><span class="tip" title="Country as found in a GeoIP database by resolving the relay's first onion-routing address.">Country</span></dt> - <dd><% if (relay.get('country')) { %><img class="inline country" title="<%= relay.get('countryname') %>" alt="" src="/images/cc/<%= relay.get('country') %>.png"/> <%= relay.get('countryname') %><% } else { %>Unknown<% } %></dd> + <dd><% if (relay.get('country')) { %><img class="inline country" title="<%= relay.get('countryname') %>" alt="" src="/images/cc/<%= relay.get('country') %>.png"/> <a href="#search/country:<%= relay.get('country') %>"><%= relay.get('countryname') %></a> (<a href="#search/country:<%= relay.get('country') %>%20flag:exit"><img src="/images/flags/exit.png" title="All exits in <%= relay.get('countryname') %>"></a>)<% } else { %>Unknown<% } %></dd> <dt><span class="tip" title="Autonomous System Number">AS Number</span></dt> <dd><% if (relay.get('as_number') !== null) { %><a href="#search/as:<%= relay.get('as_number') %>"><%= _.escape(relay.get('as_number')) %></a><% } else { %>unknown<% }; %></dd>

1 0

[metrics-web/master] Restrict scary warning to obsolete relays
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 17f9c80e678472aaf711365e8423becb4067f56b Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Fri Jul 6 13:13:01 2018 +0100 Restrict scary warning to obsolete relays This restricts the scary warning informing relay operators to upgrade as soon as possible to only outdated relays according to the Onionoo version_status field. Fixes: #25199 --- src/main/resources/web/js/rs/models/relay.js | 2 +- src/main/resources/web/templates/rs/details/router.html | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/resources/web/js/rs/models/relay.js b/src/main/resources/web/js/rs/models/relay.js index cfb6dec..d01f748 100644 --- a/src/main/resources/web/js/rs/models/relay.js +++ b/src/main/resources/web/js/rs/models/relay.js @@ -60,7 +60,7 @@ define([ var model = this; _.each(flags, function(flag) { if (flag == "Not Recommended") { - output.push([flag,"notrecommended", "This relay is running a Tor version that is not recommended by the directory authorities and may contain known issues."]); + output.push([flag,"notrecommended", "This relay is running a Tor version that is not recommended by the directory authorities and may contain known issues. This includes both obsolete and experimental versions."]); } if (flag == "Unmeasured") { output.push([flag,"unmeasured", "This relay has not been measured by at least 3 bandwidth authorities and so its consensus weight is currently capped. This is expected for new relays."]); diff --git a/src/main/resources/web/templates/rs/details/router.html b/src/main/resources/web/templates/rs/details/router.html index ef0508c..c5ff77f 100644 --- a/src/main/resources/web/templates/rs/details/router.html +++ b/src/main/resources/web/templates/rs/details/router.html @@ -10,13 +10,11 @@ <% if (relay.get('new_relay') === true) {%> <div class="alert alert-info">This relay appears to be less than 2 weeks old. <a href="https://blog.torproject.org/lifecycle-new-relay">This blog post</a> explains the lifecycle of a new relay, and why it will not be immediately fully used to capacity.</div> <% } %> -<% if (relay.get('recommended_version') === false && relay.get('version_consistent') == true) { %> -<div class="alert alert-danger">This relay is running a version of Tor that is not recommended. -It is most likely too old and may be missing important security fixes. If -this is the case, and this is your relay, you should update it as soon as -possible. Development versions (versions that are too new) will also trigger -this warning message (see bug <a -href="https://bugs.torproject.org/24256">#24256</a>).</div> +<% if (relay.get('version_status') === 'obsolete' + && relay.get('version_consistent') == true) { %> +<div class="alert alert-danger">This relay is running a version of Tor that is +too old and may be missing important security fixes. If this is your relay, you +should update it as soon as possible.</div> <% } %> <div class="row"> <div class="col-md-6">

1 0

[metrics-web/master] Update news.json to version 276 of doc/MetricsTimeline.
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 7c30c3ab62f6733599803c955d266ca2c2253c58 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 9 15:15:25 2018 +0200 Update news.json to version 276 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 56 ++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 27f87c4..63db2d2 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -3086,6 +3086,48 @@ "target" : "https://blog.torproject.org/tor-browser-80a8-released" } ] }, { + "start" : "2018-06-20", + "ongoing" : true, + "places" : [ "ve" ], + "short_description" : "Venezuela's largest ISP, CANTV, blocks direct access to Tor and the IP addresses of default bridges", + "description" : "Venezuela's largest ISP, CANTV, blocks direct access to Tor and the IP addresses of default bridges. meek and non-default bridges are reported to work.", + "links" : [ { + "label" : "mailing list post", + "target" : "https://lists.torproject.org/pipermail/tor-project/2018-June/001842.html" + }, { + "label" : "Access Now report", + "target" : "https://www.accessnow.org/venezuela-blocks-tor/" + } ] +}, { + "start" : "2018-07-01", + "ongoing" : true, + "places" : [ "ug" ], + "short_description" : "A social media tax takes effect in Uganda", + "description" : "A social media tax takes effect in Uganda. The government pressures ISPs to block VPNs.", + "links" : [ { + "label" : "relay graph", + "target" : "https://metrics.torproject.org/userstats-relay-country.html?start=2018-05-0…" + }, { + "label" : "bridge graph", + "target" : "https://metrics.torproject.org/userstats-bridge-country.html?start=2018-05-…" + }, { + "label" : "BBC article", + "target" : "https://www.bbc.com/news/world-africa-44315675" + }, { + "label" : "AllAfrica article", + "target" : "http://allafrica.com/stories/201807040129.html" + } ] +}, { + "start" : "2018-07-04", + "end" : "2018-07-06", + "protocols" : [ "snowflake" ], + "short_description" : "Outage of the Snowflake bridge, caused by a full disk.", + "description" : "Outage of the Snowflake bridge, caused by a full disk.", + "links" : [ { + "label" : "ticket", + "target" : "https://bugs.torproject.org/26661" + } ] +}, { "start" : "2016-02-24", "places" : [ "tm" ], "protocols" : [ "<OR>" ], @@ -3724,18 +3766,4 @@ "target" : "https://bugs.torproject.org/21014#comment:19" } ], "unknown" : true -}, { - "start" : "2018-06-20", - "ongoing" : true, - "places" : [ "ve" ], - "short_description" : "Venezuela's largest ISP, CANTV, blocks direct access to Tor and the IP addresses of default bridges", - "description" : "Venezuela's largest ISP, CANTV, blocks direct access to Tor and the IP addresses of default bridges. meek and non-default bridges are reported to work.", - "links" : [ { - "label" : "mailing list post", - "target" : "https://lists.torproject.org/pipermail/tor-project/2018-June/001842.html" - }, { - "label" : "Access Now report", - "target" : "https://www.accessnow.org/venezuela-blocks-tor/" - } ], - "unknown" : true } ] \ No newline at end of file

1 0

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit 823eb35ba8e470c04874a32ab0efb3e81cfda1ef Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 9 15:13:48 2018 +0200 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index feabf88..a67a471 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit feabf88fff34465134da9ea61592f7f9c30415b7 +Subproject commit a67a4713f64dca654928d10d6f5ff469540a47cf

1 0

[tor/master] Rename sandbox_getaddrinfo() et. al.
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 439b528f25e29b572a7bd04bc1d5fcaee68f5796 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Jul 3 14:27:57 2018 +0300 Rename sandbox_getaddrinfo() et. al. --- changes/bug26525 | 4 ++++ src/lib/net/address.c | 4 ++-- src/lib/net/resolve.c | 18 +++++++++--------- src/lib/net/resolve.h | 21 +++++++++------------ src/lib/sandbox/sandbox.c | 2 +- src/or/main.c | 4 ++-- 6 files changed, 27 insertions(+), 26 deletions(-) diff --git a/changes/bug26525 b/changes/bug26525 new file mode 100644 index 000000000..27862eee9 --- /dev/null +++ b/changes/bug26525 @@ -0,0 +1,4 @@ + o Minor bugfixes (code quality): + - Rename sandbox_getaddrinfo() and other functions to no longer + misleadingly suggest that they are sandbox-only. Fixes bug + 26525; bugfix on 0.2.7.1-alpha. diff --git a/src/lib/net/address.c b/src/lib/net/address.c index 10e38871e..f3eddca7b 100644 --- a/src/lib/net/address.c +++ b/src/lib/net/address.c @@ -277,7 +277,7 @@ tor_addr_lookup,(const char *name, uint16_t family, tor_addr_t *addr)) memset(&hints, 0, sizeof(hints)); hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; - err = sandbox_getaddrinfo(name, NULL, &hints, &res); + err = tor_getaddrinfo(name, NULL, &hints, &res); /* The check for 'res' here shouldn't be necessary, but it makes static * analysis tools happy. */ if (!err && res) { @@ -306,7 +306,7 @@ tor_addr_lookup,(const char *name, uint16_t family, tor_addr_t *addr)) &((struct sockaddr_in6*)best->ai_addr)->sin6_addr); result = 0; } - sandbox_freeaddrinfo(res); + tor_freeaddrinfo(res); return result; } return (err == EAI_AGAIN) ? 1 : -1; diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c index fefd5cceb..cbe368ccf 100644 --- a/src/lib/net/resolve.c +++ b/src/lib/net/resolve.c @@ -121,16 +121,16 @@ sandbox_disable_getaddrinfo_cache(void) } void -sandbox_freeaddrinfo(struct addrinfo *ai) +tor_freeaddrinfo(struct addrinfo *ai) { if (sandbox_getaddrinfo_cache_disabled) freeaddrinfo(ai); } int -sandbox_getaddrinfo(const char *name, const char *servname, - const struct addrinfo *hints, - struct addrinfo **res) +tor_getaddrinfo(const char *name, const char *servname, + const struct addrinfo *hints, + struct addrinfo **res) { int err; struct cached_getaddrinfo_item_t search, *item; @@ -191,7 +191,7 @@ sandbox_getaddrinfo(const char *name, const char *servname, } int -sandbox_add_addrinfo(const char *name) +tor_add_addrinfo(const char *name) { struct addrinfo *res; struct addrinfo hints; @@ -204,16 +204,16 @@ sandbox_add_addrinfo(const char *name) hints.ai_family = families[i]; res = NULL; - (void) sandbox_getaddrinfo(name, NULL, &hints, &res); + (void) tor_getaddrinfo(name, NULL, &hints, &res); if (res) - sandbox_freeaddrinfo(res); + tor_freeaddrinfo(res); } return 0; } void -sandbox_free_getaddrinfo_cache(void) +tor_free_getaddrinfo_cache(void) { cached_getaddrinfo_item_t **next, **item, *this; @@ -229,7 +229,7 @@ sandbox_free_getaddrinfo_cache(void) } void -sandbox_make_getaddrinfo_cache_active(void) +tor_make_getaddrinfo_cache_active(void) { sandbox_getaddrinfo_is_active = 1; } diff --git a/src/lib/net/resolve.h b/src/lib/net/resolve.h index a225be87f..f2280ae7e 100644 --- a/src/lib/net/resolve.h +++ b/src/lib/net/resolve.h @@ -22,27 +22,24 @@ MOCK_DECL(int,tor_lookup_hostname,(const char *name, uint32_t *addr)); struct addrinfo; #ifdef USE_SANDBOX_GETADDRINFO /** Pre-calls getaddrinfo in order to pre-record result. */ -int sandbox_add_addrinfo(const char *addr); +int tor_add_addrinfo(const char *addr); -// XXXX rename these. They are named as though they were sandbox-only, -// XXXX but in fact they're the only allowed entry point to getaddrinfo. -// XXXX They don't invoke the sandbox code; they only have an internal cache. struct addrinfo; /** Replacement for getaddrinfo(), using pre-recorded results. */ -int sandbox_getaddrinfo(const char *name, const char *servname, +int tor_getaddrinfo(const char *name, const char *servname, const struct addrinfo *hints, struct addrinfo **res); -void sandbox_freeaddrinfo(struct addrinfo *addrinfo); -void sandbox_free_getaddrinfo_cache(void); -void sandbox_make_getaddrinfo_cache_active(void); +void tor_freeaddrinfo(struct addrinfo *addrinfo); +void tor_free_getaddrinfo_cache(void); +void tor_make_getaddrinfo_cache_active(void); #else /* !(defined(USE_SANDBOX_GETADDRINFO)) */ -#define sandbox_getaddrinfo(name, servname, hints, res) \ +#define tor_getaddrinfo(name, servname, hints, res) \ getaddrinfo((name),(servname), (hints),(res)) -#define sandbox_add_addrinfo(name) \ +#define tor_add_addrinfo(name) \ ((void)(name)) -#define sandbox_freeaddrinfo(addrinfo) \ +#define tor_freeaddrinfo(addrinfo) \ freeaddrinfo((addrinfo)) -#define sandbox_free_getaddrinfo_cache() +#define tor_free_getaddrinfo_cache() #endif /* defined(USE_SANDBOX_GETADDRINFO) */ void sandbox_disable_getaddrinfo_cache(void); diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index e49cbd863..25dd6d1c2 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -1552,7 +1552,7 @@ install_syscall_filter(sandbox_cfg_t* cfg) // marking the sandbox as active sandbox_active = 1; - sandbox_make_getaddrinfo_cache_active(); + tor_make_getaddrinfo_cache_active(); end: seccomp_release(ctx); diff --git a/src/or/main.c b/src/or/main.c index 81a8cfbee..d24f5a7ff 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3668,7 +3668,7 @@ tor_free_all(int postfork) routerparse_free_all(); ext_orport_free_all(); control_free_all(); - sandbox_free_getaddrinfo_cache(); + tor_free_getaddrinfo_cache(); protover_free_all(); bridges_free_all(); consdiffmgr_free_all(); @@ -3890,7 +3890,7 @@ init_addrinfo(void) // host name to sandbox gethostname(hname, sizeof(hname)); - sandbox_add_addrinfo(hname); + tor_add_addrinfo(hname); } static sandbox_cfg_t*

1 0

[tor/master] Merge remote-tracking branch 'rl1987/bug26525'
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 03283c00d86f9affe9d369b3e0f116770d4e0ec6 Merge: 47859e11e 439b528f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:31:12 2018 -0400 Merge remote-tracking branch 'rl1987/bug26525' changes/bug26525 | 4 ++++ src/core/mainloop/main.c | 4 ++-- src/lib/net/address.c | 4 ++-- src/lib/net/resolve.c | 18 +++++++++--------- src/lib/net/resolve.h | 21 +++++++++------------ src/lib/sandbox/sandbox.c | 2 +- 6 files changed, 27 insertions(+), 26 deletions(-)

1 0

[tor/maint-0.3.3] Bump to 0.3.3.8
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 532873a9243041d63f33dc0df37a9101828bd92d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:24:07 2018 -0400 Bump to 0.3.3.8 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index bb0602f13..9b3fb0a53 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.3.7-dev]) +AC_INIT([tor],[0.3.3.8]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 15d0d32d6..a86b5cf3f 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.3.7-dev" +!define VERSION "0.3.3.8" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 2fd983172..e66ab2b65 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.3.7-dev" +#define VERSION "0.3.3.8"

1 0

[tor/maint-0.3.4] Bump to 0.3.3.4-rc
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 9320100d6eb4b3ce4f18d2b37783f92352521f15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:23:39 2018 -0400 Bump to 0.3.3.4-rc --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 27cb0323c..8cc509c43 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.4.3-alpha-dev]) +AC_INIT([tor],[0.3.4.4-rc]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 32f1f23e7..bdf310bc9 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.4.3-alpha-dev" +!define VERSION "0.3.4.4-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 757ea2945..45578f9bb 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.4.3-alpha-dev" +#define VERSION "0.3.4.4-rc"

1 0