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

[tor/master] Split the rewrite part of rewrite-and-attach
by nickm＠torproject.org 19 Jan '15

19 Jan '15

commit fc2831558c498d6fbc0071d1ebef5c42006a4a27 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 19:59:24 2015 -0500 Split the rewrite part of rewrite-and-attach I'd also like to split out the part that sends early socks responses. --- src/or/connection_edge.c | 105 +++++++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index d8f397b..ed85c72 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -908,41 +908,32 @@ connection_ap_rewrite_and_attach_if_allowed(entry_connection_t *conn, return connection_ap_handshake_rewrite_and_attach(conn, circ, cpath); } -/** Connection conn just finished its socks handshake, or the - * controller asked us to take care of it. If circ is defined, - * then that's where we'll want to attach it. Otherwise we have to - * figure it out ourselves. - * - * First, parse whether it's a .exit address, remap it, and so on. Then - * if it's for a general circuit, try to attach it to a circuit (or launch - * one as needed), else if it's for a rendezvous circuit, fetch a - * rendezvous descriptor first (or attach/launch a circuit if the - * rendezvous descriptor is already here and fresh enough). - * - * The stream will exit from the hop - * indicated by cpath, or from the last hop in circ's cpath if - * cpath is NULL. - */ -int -connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, - origin_circuit_t *circ, - crypt_path_t *cpath) +typedef struct { + char orig_address[MAX_SOCKS_ADDR_LEN]; + /* We set this to true if this is an address we should automatically + * remap to a local address in VirtualAddrNetwork */ + int automap; + addressmap_entry_source_t exit_source; + time_t map_expires; +} rewrite_result_t; + +/* DOCDOC 0 if closed successfully. -1 if closed on error. 1 if not + * closed. +*/ +static int +connection_ap_handshake_rewrite(entry_connection_t *conn, + rewrite_result_t *out) { socks_request_t *socks = conn->socks_request; - hostname_type_t addresstype; const or_options_t *options = get_options(); tor_addr_t addr_tmp; - /* We set this to true if this is an address we should automatically - * remap to a local address in VirtualAddrNetwork */ - int automap = 0; - char orig_address[MAX_SOCKS_ADDR_LEN]; - time_t map_expires = TIME_MAX; - time_t now = time(NULL); - connection_t *base_conn = ENTRY_TO_CONN(conn); - addressmap_entry_source_t exit_source = ADDRMAPSRC_NONE; + + out->automap = 0; + out->exit_source = ADDRMAPSRC_NONE; + out->map_expires = TIME_MAX; tor_strlower(socks->address); /* normalize it */ - strlcpy(orig_address, socks->address, sizeof(orig_address)); + strlcpy(out->orig_address, socks->address, sizeof(out->orig_address)); log_debug(LD_APP,"Client asked for %s:%d", safe_str_client(socks->address), socks->port); @@ -963,8 +954,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, if (socks->command == SOCKS_COMMAND_RESOLVE && tor_addr_parse(&addr_tmp, socks->address)<0 && options->AutomapHostsOnResolve) { - automap = addressmap_address_should_automap(socks->address, options); - if (automap) { + out->automap = addressmap_address_should_automap(socks->address, options); + if (out->automap) { const char *new_addr; int addr_type = RESOLVED_TYPE_IPV4; if (conn->socks_request->socks_version != 4) { @@ -996,15 +987,15 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, rewrite_flags |= AMR_FLAG_USE_IPV6_DNS; if (addressmap_rewrite_reverse(socks->address, sizeof(socks->address), - rewrite_flags, &map_expires)) { + rewrite_flags, &out->map_expires)) { char *result = tor_strdup(socks->address); /* remember _what_ is supposed to have been resolved. */ tor_snprintf(socks->address, sizeof(socks->address), "REVERSE[%s]", - orig_address); + out->orig_address); connection_ap_handshake_socks_resolved(conn, RESOLVED_TYPE_HOSTNAME, strlen(result), (uint8_t*)result, -1, - map_expires); + out->map_expires); connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -1025,7 +1016,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, return -1; } } - } else if (!automap) { + } else if (!out->automap) { /* For address map controls, remap the address. */ unsigned rewrite_flags = 0; if (conn->use_cached_ipv4_answers) @@ -1033,13 +1024,13 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, if (conn->use_cached_ipv6_answers) rewrite_flags |= AMR_FLAG_USE_IPV6_DNS; if (addressmap_rewrite(socks->address, sizeof(socks->address), - rewrite_flags, &map_expires, &exit_source)) { + rewrite_flags, &out->map_expires, &out->exit_source)) { control_event_stream_status(conn, STREAM_EVENT_REMAP, REMAP_STREAM_SOURCE_CACHE); } } - if (!automap && address_is_in_virtual_range(socks->address)) { + if (!out->automap && address_is_in_virtual_range(socks->address)) { /* This address was probably handed out by client_dns_get_unmapped_address, * but the mapping was discarded for some reason. We *don't* want to send * the address through Tor; that's likely to fail, and may leak @@ -1051,6 +1042,44 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, return -1; } + return 1; +} + +/** Connection conn just finished its socks handshake, or the + * controller asked us to take care of it. If circ is defined, + * then that's where we'll want to attach it. Otherwise we have to + * figure it out ourselves. + * + * First, parse whether it's a .exit address, remap it, and so on. Then + * if it's for a general circuit, try to attach it to a circuit (or launch + * one as needed), else if it's for a rendezvous circuit, fetch a + * rendezvous descriptor first (or attach/launch a circuit if the + * rendezvous descriptor is already here and fresh enough). + * + * The stream will exit from the hop + * indicated by cpath, or from the last hop in circ's cpath if + * cpath is NULL. + */ +int +connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, + origin_circuit_t *circ, + crypt_path_t *cpath) +{ + int r; + socks_request_t *socks = conn->socks_request; + hostname_type_t addresstype; + const or_options_t *options = get_options(); + connection_t *base_conn = ENTRY_TO_CONN(conn); + time_t now = time(NULL); + rewrite_result_t rr; + + memset(&rr, 0, sizeof(rr)); + if ((r = connection_ap_handshake_rewrite(conn,&rr)) != 1) + return r; + time_t map_expires = rr.map_expires; + int automap = rr.automap; + addressmap_entry_source_t exit_source = rr.exit_source; + /* Parse the address provided by SOCKS. Modify it in-place if it * specifies a hidden-service (.onion) or particular exit node (.exit). */ @@ -1175,7 +1204,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, /* Reply to resolves immediately if we can. */ if (tor_addr_parse(&answer, socks->address) >= 0) {/* is it an IP? */ /* remember _what_ is supposed to have been resolved. */ - strlcpy(socks->address, orig_address, sizeof(socks->address)); + strlcpy(socks->address, rr.orig_address, sizeof(socks->address)); connection_ap_handshake_socks_resolved_addr(conn, &answer, -1, map_expires); connection_mark_unattached_ap(conn,

1 0

[tor/master] Move stream-closing out of rewrite code
by nickm＠torproject.org 19 Jan '15

19 Jan '15

commit cd6a57e3d560c023de849ba3cd70b4625a85a3f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 20:07:35 2015 -0500 Move stream-closing out of rewrite code --- src/or/connection_edge.c | 56 ++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index ed85c72..c1215f7 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -915,12 +915,14 @@ typedef struct { int automap; addressmap_entry_source_t exit_source; time_t map_expires; + + int end_reason; + int should_close; } rewrite_result_t; -/* DOCDOC 0 if closed successfully. -1 if closed on error. 1 if not - * closed. +/* DOCDOC */ -static int +static void connection_ap_handshake_rewrite(entry_connection_t *conn, rewrite_result_t *out) { @@ -931,6 +933,8 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, out->automap = 0; out->exit_source = ADDRMAPSRC_NONE; out->map_expires = TIME_MAX; + out->end_reason = 0; + out->should_close = 0; tor_strlower(socks->address); /* normalize it */ strlcpy(out->orig_address, socks->address, sizeof(out->orig_address)); @@ -944,8 +948,9 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, "it (at your own risk)."); control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", escaped(socks->address)); - connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); - return -1; + out->end_reason = END_STREAM_REASON_TORPROTOCOL; + out->should_close = 1; + return; } if (! conn->original_dest_address) @@ -969,8 +974,9 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, if (! new_addr) { log_warn(LD_APP, "Unable to automap address %s", escaped_safe_str(socks->address)); - connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL); - return -1; + out->end_reason = END_STREAM_REASON_INTERNAL; + out->should_close = 1; + return; } log_info(LD_APP, "Automapping %s to %s", escaped_safe_str_client(socks->address), @@ -996,10 +1002,10 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, strlen(result), (uint8_t*)result, -1, out->map_expires); - connection_mark_unattached_ap(conn, - END_STREAM_REASON_DONE | - END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); - return 0; + out->end_reason = END_STREAM_REASON_DONE | + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED; + out->should_close = 1; + return; } if (options->ClientDNSRejectInternalAddresses) { /* Don't let people try to do a reverse lookup on 10.0.0.1. */ @@ -1010,10 +1016,10 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, if (ok == 1 && tor_addr_is_internal(&addr, 0)) { connection_ap_handshake_socks_resolved(conn, RESOLVED_TYPE_ERROR, 0, NULL, -1, TIME_MAX); - connection_mark_unattached_ap(conn, - END_STREAM_REASON_SOCKSPROTOCOL | - END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); - return -1; + out->end_reason = END_STREAM_REASON_SOCKSPROTOCOL | + END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED; + out->should_close = 1; + return; } } } else if (!out->automap) { @@ -1038,11 +1044,10 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, */ log_warn(LD_APP,"Missing mapping for virtual address '%s'. Refusing.", safe_str_client(socks->address)); - connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL); - return -1; + out->end_reason = END_STREAM_REASON_INTERNAL; + out->should_close = 1; + return; } - - return 1; } /** Connection conn just finished its socks handshake, or the @@ -1065,7 +1070,6 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, origin_circuit_t *circ, crypt_path_t *cpath) { - int r; socks_request_t *socks = conn->socks_request; hostname_type_t addresstype; const or_options_t *options = get_options(); @@ -1074,8 +1078,16 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, rewrite_result_t rr; memset(&rr, 0, sizeof(rr)); - if ((r = connection_ap_handshake_rewrite(conn,&rr)) != 1) - return r; + connection_ap_handshake_rewrite(conn,&rr); + + if (rr.should_close) { + connection_mark_unattached_ap(conn, rr.end_reason); + if (0 != (rr.end_reason & END_STREAM_REASON_DONE)) + return 0; + else + return -1; + } + time_t map_expires = rr.map_expires; int automap = rr.automap; addressmap_entry_source_t exit_source = rr.exit_source;

1 0

[tor/master] Begin writing unit tests for rewrite code
by nickm＠torproject.org 19 Jan '15

19 Jan '15

commit bba995e6660dbb49876886278f71d7d5a85f5f88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 12 21:08:43 2015 -0500 Begin writing unit tests for rewrite code --- src/or/connection_edge.c | 1 + src/or/connection_edge.h | 3 +- src/test/include.am | 1 + src/test/test.c | 2 + src/test/test_entryconn.c | 265 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 271 insertions(+), 1 deletion(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 56e496f..ca99a86 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -924,6 +924,7 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, out->map_expires = TIME_MAX; out->end_reason = 0; out->should_close = 0; + out->orig_address[0] = 0; tor_strlower(socks->address); /* normalize it */ strlcpy(out->orig_address, socks->address, sizeof(out->orig_address)); diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index af564ce..d4a20e7 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -151,7 +151,8 @@ typedef struct { */ char orig_address[MAX_SOCKS_ADDR_LEN]; /** True iff the address has been automatically remapped to a local - * address in VirtualAddrNetwork */ + * address in VirtualAddrNetwork. (Only set true the first time we + * do the mapping.) */ int automap; /** If this connection has a .exit address, who put it there? */ addressmap_entry_source_t exit_source; diff --git a/src/test/include.am b/src/test/include.am index 9db1587..46db801 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -31,6 +31,7 @@ src_test_test_SOURCES = \ src/test/test_data.c \ src/test/test_dir.c \ src/test/test_checkdir.c \ + src/test/test_entryconn.c \ src/test/test_entrynodes.c \ src/test/test_extorport.c \ src/test/test_introduce.c \ diff --git a/src/test/test.c b/src/test/test.c index de6efaf..65d15f1 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1313,6 +1313,7 @@ extern struct testcase_t channel_tests[]; extern struct testcase_t channeltls_tests[]; extern struct testcase_t relay_tests[]; extern struct testcase_t scheduler_tests[]; +extern struct testcase_t entryconn_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -1337,6 +1338,7 @@ static struct testgroup_t testgroups[] = { { "circuitmux/", circuitmux_tests }, { "options/", options_tests }, { "entrynodes/", entrynodes_tests }, + { "entryconn/", entryconn_tests }, { "extorport/", extorport_tests }, { "control/", controller_event_tests }, { "hs/", hs_tests }, diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c new file mode 100644 index 0000000..1c77394 --- /dev/null +++ b/src/test/test_entryconn.c @@ -0,0 +1,265 @@ +/* Copyright (c) 2014-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" + +#define CONNECTION_PRIVATE +#define CONNECTION_EDGE_PRIVATE + +#include "or.h" +#include "test.h" + +#include "addressmap.h" +#include "config.h" +#include "connection.h" +#include "connection_edge.h" + +static void * +entryconn_rewrite_setup(const struct testcase_t *tc) +{ + (void)tc; + entry_connection_t *ec = entry_connection_new(CONN_TYPE_AP, AF_INET); + addressmap_init(); + return ec; +} + +static int +entryconn_rewrite_teardown(const struct testcase_t *tc, void *arg) +{ + (void)tc; + entry_connection_t *ec = arg; + if (ec) + connection_free_(ENTRY_TO_CONN(ec)); + addressmap_free_all(); + return 1; +} + +static struct testcase_setup_t test_rewrite_setup = { + entryconn_rewrite_setup, entryconn_rewrite_teardown +}; + +/* Simple rewrite: no changes needed */ +static void +test_entryconn_rewrite_basic(void *arg) +{ + entry_connection_t *ec = arg; + rewrite_result_t rr; + + tt_assert(ec->socks_request); + strlcpy(ec->socks_request->address, "www.TORproject.org", + sizeof(ec->socks_request->address)); + ec->socks_request->command = SOCKS_COMMAND_CONNECT; + connection_ap_handshake_rewrite(ec, &rr); + + tt_int_op(rr.should_close, OP_EQ, 0); + tt_int_op(rr.end_reason, OP_EQ, 0); + tt_int_op(rr.automap, OP_EQ, 0); + tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX); + tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE); + tt_str_op(rr.orig_address, OP_EQ, "www.torproject.org"); + tt_str_op(ec->socks_request->address, OP_EQ, "www.torproject.org"); + tt_str_op(ec->original_dest_address, OP_EQ, "www.torproject.org"); + + done: + ; +} + +/* Rewrite but reject because of disallowed .exit */ +static void +test_entryconn_rewrite_bad_dotexit(void *arg) +{ + entry_connection_t *ec = arg; + rewrite_result_t rr; + + get_options_mutable()->AllowDotExit = 0; + tt_assert(ec->socks_request); + strlcpy(ec->socks_request->address, "www.TORproject.org.foo.exit", + sizeof(ec->socks_request->address)); + ec->socks_request->command = SOCKS_COMMAND_CONNECT; + connection_ap_handshake_rewrite(ec, &rr); + + tt_int_op(rr.should_close, OP_EQ, 1); + tt_int_op(rr.end_reason, OP_EQ, END_STREAM_REASON_TORPROTOCOL); + + done: + ; +} + +/* Automap on resolve, connect to automapped address, resolve again and get + * same answer. (IPv4) */ +static void +test_entryconn_rewrite_automap_ipv4(void *arg) +{ + entry_connection_t *ec = arg; + entry_connection_t *ec2=NULL, *ec3=NULL; + rewrite_result_t rr; + char *msg = NULL; + + ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET); + ec3 = entry_connection_new(CONN_TYPE_AP, AF_INET); + + get_options_mutable()->AutomapHostsOnResolve = 1; + get_options_mutable()->AutomapHostsSuffixes = smartlist_new(); + smartlist_add(get_options_mutable()->AutomapHostsSuffixes, tor_strdup(".")); + parse_virtual_addr_network("127.202.0.0/16", AF_INET, 0, &msg); + + /* Automap this on resolve. */ + strlcpy(ec->socks_request->address, "WWW.MIT.EDU", + sizeof(ec->socks_request->address)); + ec->socks_request->command = SOCKS_COMMAND_RESOLVE; + connection_ap_handshake_rewrite(ec, &rr); + + tt_int_op(rr.automap, OP_EQ, 1); + tt_int_op(rr.should_close, OP_EQ, 0); + tt_int_op(rr.end_reason, OP_EQ, 0); + tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX); + tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE); + tt_str_op(rr.orig_address, OP_EQ, "www.mit.edu"); + tt_str_op(ec->original_dest_address, OP_EQ, "www.mit.edu"); + + tt_assert(!strcmpstart(ec->socks_request->address,"127.202.")); + + /* Connect to it and make sure we get the original address back. */ + strlcpy(ec2->socks_request->address, ec->socks_request->address, + sizeof(ec2->socks_request->address)); + + ec2->socks_request->command = SOCKS_COMMAND_CONNECT; + connection_ap_handshake_rewrite(ec2, &rr); + + tt_int_op(rr.automap, OP_EQ, 0); + tt_int_op(rr.should_close, OP_EQ, 0); + tt_int_op(rr.end_reason, OP_EQ, 0); + tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX); + tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE); + tt_str_op(rr.orig_address, OP_EQ, ec->socks_request->address); + tt_str_op(ec2->original_dest_address, OP_EQ, ec->socks_request->address); + tt_str_op(ec2->socks_request->address, OP_EQ, "www.mit.edu"); + + /* Resolve it again, make sure the answer is the same. */ + strlcpy(ec3->socks_request->address, "www.MIT.EDU", + sizeof(ec3->socks_request->address)); + ec3->socks_request->command = SOCKS_COMMAND_RESOLVE; + connection_ap_handshake_rewrite(ec3, &rr); + + tt_int_op(rr.automap, OP_EQ, 1); + tt_int_op(rr.should_close, OP_EQ, 0); + tt_int_op(rr.end_reason, OP_EQ, 0); + tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX); + tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE); + tt_str_op(rr.orig_address, OP_EQ, "www.mit.edu"); + tt_str_op(ec3->original_dest_address, OP_EQ, "www.mit.edu"); + + tt_str_op(ec3->socks_request->address, OP_EQ, + ec->socks_request->address); + + done: + connection_free_(ENTRY_TO_CONN(ec2)); + connection_free_(ENTRY_TO_CONN(ec3)); +} + +/* Automap on resolve, connect to automapped address, resolve again and get + * same answer. (IPv6) */ +static void +test_entryconn_rewrite_automap_ipv6(void *arg) +{ + entry_connection_t *ec = arg; + entry_connection_t *ec2=NULL, *ec3=NULL; + rewrite_result_t rr; + char *msg = NULL; + connection_free_(ENTRY_TO_CONN(ec)); + ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET6); + ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET6); + ec3 = entry_connection_new(CONN_TYPE_AP, AF_INET6); + + get_options_mutable()->AutomapHostsOnResolve = 1; + get_options_mutable()->AutomapHostsSuffixes = smartlist_new(); + smartlist_add(get_options_mutable()->AutomapHostsSuffixes, tor_strdup(".")); + parse_virtual_addr_network("FE80::/32", AF_INET6, 0, &msg); + + /* Automap this on resolve. */ + strlcpy(ec->socks_request->address, "WWW.MIT.EDU", + sizeof(ec->socks_request->address)); + ec->socks_request->command = SOCKS_COMMAND_RESOLVE; + connection_ap_handshake_rewrite(ec, &rr); + + tt_int_op(rr.automap, OP_EQ, 1); + tt_int_op(rr.should_close, OP_EQ, 0); + tt_int_op(rr.end_reason, OP_EQ, 0); + tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX); + tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE); + tt_str_op(rr.orig_address, OP_EQ, "www.mit.edu"); + tt_str_op(ec->original_dest_address, OP_EQ, "www.mit.edu"); + + printf("<%s>\n", ec->socks_request->address); + /* XXXX Should this [ be here? */ + tt_assert(!strcmpstart(ec->socks_request->address,"[fe80:")); + + /* Connect to it and make sure we get the original address back. */ + strlcpy(ec2->socks_request->address, ec->socks_request->address, + sizeof(ec2->socks_request->address)); + + ec2->socks_request->command = SOCKS_COMMAND_CONNECT; + connection_ap_handshake_rewrite(ec2, &rr); + + tt_int_op(rr.automap, OP_EQ, 0); + tt_int_op(rr.should_close, OP_EQ, 0); + tt_int_op(rr.end_reason, OP_EQ, 0); + tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX); + tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE); + tt_str_op(rr.orig_address, OP_EQ, ec->socks_request->address); + tt_str_op(ec2->original_dest_address, OP_EQ, ec->socks_request->address); + tt_str_op(ec2->socks_request->address, OP_EQ, "www.mit.edu"); + + /* Resolve it again, make sure the answer is the same. */ + strlcpy(ec3->socks_request->address, "www.MIT.EDU", + sizeof(ec3->socks_request->address)); + ec3->socks_request->command = SOCKS_COMMAND_RESOLVE; + connection_ap_handshake_rewrite(ec3, &rr); + + tt_int_op(rr.automap, OP_EQ, 1); + tt_int_op(rr.should_close, OP_EQ, 0); + tt_int_op(rr.end_reason, OP_EQ, 0); + tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX); + tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE); + tt_str_op(rr.orig_address, OP_EQ, "www.mit.edu"); + tt_str_op(ec3->original_dest_address, OP_EQ, "www.mit.edu"); + + tt_str_op(ec3->socks_request->address, OP_EQ, + ec->socks_request->address); + + done: + connection_free_(ENTRY_TO_CONN(ec2)); + connection_free_(ENTRY_TO_CONN(ec3)); +} + +/* automap on resolve, reverse lookup. */ + +/* Rewrite because of cached DNS entry. */ + +/* Rewrite because of AddrmapRewrite option */ + +/* Rewrite because of control port */ + +/* Rewrite into .exit because of virtual address mapping */ + +/* Rewrite into .exit because of mapaddress */ + +/* Fail to connect to unmapped address in virtual range. */ + +/* Rewrite plus automap */ + +/* Map foo.onion to longthing.onion */ + + + +#define REWRITE(name) \ + { #name, test_entryconn_##name, TT_FORK, &test_rewrite_setup, NULL } + +struct testcase_t entryconn_tests[] = { + REWRITE(rewrite_basic), + REWRITE(rewrite_bad_dotexit), + REWRITE(rewrite_automap_ipv4), + REWRITE(rewrite_automap_ipv6), + END_OF_TESTCASES +}; +

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 19 Jan '15

19 Jan '15

commit 9877028bc57c4de9203d65f098ef6c5ce6f93343 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 19 14:45:24 2015 +0000 Update translations for tails-greeter_completed --- de/de.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/de/de.po b/de/de.po index 9ef0581..7c0e1ca 100644 --- a/de/de.po +++ b/de/de.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2015-01-19 14:15+0000\n" +"PO-Revision-Date: 2015-01-19 14:21+0000\n" "Last-Translator: rike\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "Es ist im allgemeinen sicherer, MAC-Adressen zu fälschen, aber es könnte auch Verdacht erregen oder Netzwerkverbindungsprobleme verursachen." +msgstr "Es ist grundsätzlich sicherer, MAC-Adressen zu manipulieren, aber es könnte auch Verdacht erregen oder Netzwerkverbindungsprobleme verursachen." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses" @@ -152,7 +152,7 @@ msgstr "Alle MAC-Adressen manipulieren" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "Netzwerkkonfiguration" +msgstr "Netzwerkeinstellungen" #: ../glade/optionswindow.glade.h:20 msgid "" @@ -164,13 +164,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\ msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "Die Internetverbindung dieses Rechners ist frei von Hindernissen. Sie können sich direkt mit dem Tor-Netzwerk verbinden." +msgstr "Die Internet-Verbindung dieses Rechners ist frei von Hindernissen. Es kann sich direkt mit dem Tor-Netzwerk verbunden werden." #: ../glade/optionswindow.glade.h:22 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "Die Internetverbindung dieses Rechner ist zensiert, gefiltert oder vermittelt. Sie müssen Brücken-, Firewall- oder Vermittlungsservereinstellungen konfigurieren." +msgstr "Die Internet-Verbindung dieses Rechners ist zensiert, gefiltert oder vermittelt. Brücken-, Firewall- oder Vermittlungsserver-Einstellungen müssen getroffen werden." #: ../glade/langpanel.glade.h:1 msgid " " @@ -186,14 +186,14 @@ msgstr "Ort" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "Anordnung" +msgstr "Tastenbelegung" #: ../tailsgreeter/persistence.py:59 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "Live-Persist ist mit folgendem Code fehlgeschlagen %(returncode)s:\n%(stderr)s" +msgstr "live-persist ist mit Code %(returncode)s fehlgeschlagen:\n%(stderr)s" #: ../tailsgreeter/persistence.py:99 #, python-format @@ -201,7 +201,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "cryptsetup ist mit folgendem Code fehlgeschlagen %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "cryptsetup ist mit Code %(returncode)s fehlgeschlagen:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/persistence.py:124 #, python-format @@ -209,7 +209,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "Live-Persist ist mit folgendem Code fehlgeschlagen %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "live-persist ist mit Code %(returncode)s fehlgeschlagen:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 #: ../tailsgreeter/langpanel.py:183

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 19 Jan '15

19 Jan '15

commit ac2165fd52d0bb1155898701aa50dc594ec27f7d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 19 14:45:20 2015 +0000 Update translations for tails-greeter --- de/de.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/de/de.po b/de/de.po index 9ef0581..7c0e1ca 100644 --- a/de/de.po +++ b/de/de.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2015-01-19 14:15+0000\n" +"PO-Revision-Date: 2015-01-19 14:21+0000\n" "Last-Translator: rike\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -144,7 +144,7 @@ msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "Es ist im allgemeinen sicherer, MAC-Adressen zu fälschen, aber es könnte auch Verdacht erregen oder Netzwerkverbindungsprobleme verursachen." +msgstr "Es ist grundsätzlich sicherer, MAC-Adressen zu manipulieren, aber es könnte auch Verdacht erregen oder Netzwerkverbindungsprobleme verursachen." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses" @@ -152,7 +152,7 @@ msgstr "Alle MAC-Adressen manipulieren" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "Netzwerkkonfiguration" +msgstr "Netzwerkeinstellungen" #: ../glade/optionswindow.glade.h:20 msgid "" @@ -164,13 +164,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\ msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "Die Internetverbindung dieses Rechners ist frei von Hindernissen. Sie können sich direkt mit dem Tor-Netzwerk verbinden." +msgstr "Die Internet-Verbindung dieses Rechners ist frei von Hindernissen. Es kann sich direkt mit dem Tor-Netzwerk verbunden werden." #: ../glade/optionswindow.glade.h:22 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "Die Internetverbindung dieses Rechner ist zensiert, gefiltert oder vermittelt. Sie müssen Brücken-, Firewall- oder Vermittlungsservereinstellungen konfigurieren." +msgstr "Die Internet-Verbindung dieses Rechners ist zensiert, gefiltert oder vermittelt. Brücken-, Firewall- oder Vermittlungsserver-Einstellungen müssen getroffen werden." #: ../glade/langpanel.glade.h:1 msgid " " @@ -186,14 +186,14 @@ msgstr "Ort" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "Anordnung" +msgstr "Tastenbelegung" #: ../tailsgreeter/persistence.py:59 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "Live-Persist ist mit folgendem Code fehlgeschlagen %(returncode)s:\n%(stderr)s" +msgstr "live-persist ist mit Code %(returncode)s fehlgeschlagen:\n%(stderr)s" #: ../tailsgreeter/persistence.py:99 #, python-format @@ -201,7 +201,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "cryptsetup ist mit folgendem Code fehlgeschlagen %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "cryptsetup ist mit Code %(returncode)s fehlgeschlagen:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/persistence.py:124 #, python-format @@ -209,7 +209,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "Live-Persist ist mit folgendem Code fehlgeschlagen %(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "live-persist ist mit Code %(returncode)s fehlgeschlagen:\n%(stdout)s\n%(stderr)s" #: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 #: ../tailsgreeter/langpanel.py:183

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 19 Jan '15

19 Jan '15

commit f1c03b954508de12f95a9ac85ed5d9b09991d669 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 19 14:15:25 2015 +0000 Update translations for tails-greeter_completed --- de/de.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/de/de.po b/de/de.po index 42b6728..9ef0581 100644 --- a/de/de.po +++ b/de/de.po @@ -11,10 +11,10 @@ # Chris <ppt23(a)lkj.hopto.org>, 2012 # Sacro <Scion(a)T-Online.de>, 2012 # sycamoreone <sycamoreone(a)riseup.net>, 2014 -# Tobias Bannert, 2013 -# Tobias Bannert, 2014 +# Tobias Bannert <tobannert(a)gmail.com>, 2013 +# Tobias Bannert <tobannert(a)gmail.com>, 2014 # tom_fate <tomoffate(a)gmail.com>, 2014 -# rike, 2014 +# rike, 2014-2015 # Victoria Kerley <VKerley75(a)gmail.com>, 2013 # djcrackhome <wallcityserver(a)gmail.com>, 2012 # Wasilis Mandratzis <inactive+Wasilis(a)transifex.com>, 2013 @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-31 10:36+0200\n" -"PO-Revision-Date: 2014-10-07 17:34+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2015-01-19 14:15+0000\n" "Last-Translator: rike\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -90,7 +90,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/administration_password.de.htm msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "Ein Administrationspasswort eingeben, falls Sie administrative Aufgaben durchführen wollen.\nAndernfalls wird diese Funktion zur Erhöhung der Sicherheit deaktiviert." +msgstr "Geben Sie ein Administrationspasswort ein, falls Sie administrative Aufgaben durchführen wollen.\nAndernfalls wird diese Funktion zur Erhöhung der Sicherheit deaktiviert." #: ../glade/optionswindow.glade.h:7 msgid "Password:" @@ -118,11 +118,11 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.de.html\">D msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "Diese Option lässt Tails mehr wie Microsoft Windows 8 aussehen. Das könnte an öffentlichen Orten hilfreich sein, um weniger Aufsehen zu erregen." +msgstr "Diese Option lässt Tails mehr wie Microsoft Windows 8 aussehen. An öffentlichen Orten könnte das Ihnen dabei helfen, weniger aufzufallen." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "»Mircosoft Windows 8«-Tarnmodus aktivieren" +msgstr "»Microsoft Windows 8«-Tarnmodus aktivieren" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -138,7 +138,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumen msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte im lokalen Netzwerk verborgen werden. Dies kann helfen, Ihren geografischen Standort geheim zu halten." +msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte im lokalen Netzwerk verborgen werden. Dies hilft dabei, Ihren geografischen Standort geheim zu halten." #: ../glade/optionswindow.glade.h:17 msgid ""

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 19 Jan '15

19 Jan '15

commit 2a2cf31c791f45e1fdb314fb08040e25777b6fab Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 19 14:15:21 2015 +0000 Update translations for tails-greeter --- de/de.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/de/de.po b/de/de.po index 42b6728..9ef0581 100644 --- a/de/de.po +++ b/de/de.po @@ -11,10 +11,10 @@ # Chris <ppt23(a)lkj.hopto.org>, 2012 # Sacro <Scion(a)T-Online.de>, 2012 # sycamoreone <sycamoreone(a)riseup.net>, 2014 -# Tobias Bannert, 2013 -# Tobias Bannert, 2014 +# Tobias Bannert <tobannert(a)gmail.com>, 2013 +# Tobias Bannert <tobannert(a)gmail.com>, 2014 # tom_fate <tomoffate(a)gmail.com>, 2014 -# rike, 2014 +# rike, 2014-2015 # Victoria Kerley <VKerley75(a)gmail.com>, 2013 # djcrackhome <wallcityserver(a)gmail.com>, 2012 # Wasilis Mandratzis <inactive+Wasilis(a)transifex.com>, 2013 @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-31 10:36+0200\n" -"PO-Revision-Date: 2014-10-07 17:34+0000\n" +"POT-Creation-Date: 2014-10-15 16:05+0200\n" +"PO-Revision-Date: 2015-01-19 14:15+0000\n" "Last-Translator: rike\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -90,7 +90,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/administration_password.de.htm msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "Ein Administrationspasswort eingeben, falls Sie administrative Aufgaben durchführen wollen.\nAndernfalls wird diese Funktion zur Erhöhung der Sicherheit deaktiviert." +msgstr "Geben Sie ein Administrationspasswort ein, falls Sie administrative Aufgaben durchführen wollen.\nAndernfalls wird diese Funktion zur Erhöhung der Sicherheit deaktiviert." #: ../glade/optionswindow.glade.h:7 msgid "Password:" @@ -118,11 +118,11 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.de.html\">D msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "Diese Option lässt Tails mehr wie Microsoft Windows 8 aussehen. Das könnte an öffentlichen Orten hilfreich sein, um weniger Aufsehen zu erregen." +msgstr "Diese Option lässt Tails mehr wie Microsoft Windows 8 aussehen. An öffentlichen Orten könnte das Ihnen dabei helfen, weniger aufzufallen." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "»Mircosoft Windows 8«-Tarnmodus aktivieren" +msgstr "»Microsoft Windows 8«-Tarnmodus aktivieren" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -138,7 +138,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumen msgid "" "Spoofing MAC addresses hides the serial number of your network cards to the " "local networks. This can help you hide your geographical location." -msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte im lokalen Netzwerk verborgen werden. Dies kann helfen, Ihren geografischen Standort geheim zu halten." +msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte im lokalen Netzwerk verborgen werden. Dies hilft dabei, Ihren geografischen Standort geheim zu halten." #: ../glade/optionswindow.glade.h:17 msgid ""

1 0

[metrics-lib/master] Fix blocking in descriptor reader, found by iwakeh.
by karsten＠torproject.org 19 Jan '15

19 Jan '15

commit 8badff7a5bfd049a7bec4349e598ed89525ae84c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 13 18:17:52 2015 +0100 Fix blocking in descriptor reader, found by iwakeh. Fixes #14071. --- .../descriptor/impl/DescriptorReaderImpl.java | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 0811273..94c1d2e 100644 --- a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -150,12 +150,24 @@ public class DescriptorReaderImpl implements DescriptorReader { failUnrecognizedDescriptorLines); } public void run() { - this.readOldHistory(); - this.readDescriptors(); - this.readTarballs(); - this.hasFinishedReading = true; - this.descriptorQueue.setOutOfDescriptors(); - this.writeNewHistory(); + try { + this.readOldHistory(); + this.readDescriptors(); + this.readTarballs(); + this.hasFinishedReading = true; + } catch (Throwable t) { + /* We're usually not writing to stdout or stderr, but we shouldn't + * stay quiet about this potential bug. If we were to switch to a + * logging API, this would qualify as ERROR. */ + System.err.println("Bug: uncaught exception or error while " + + "reading descriptors:"); + t.printStackTrace(); + } finally { + this.descriptorQueue.setOutOfDescriptors(); + } + if (this.hasFinishedReading) { + this.writeNewHistory(); + } } private void readOldHistory() { if (this.historyFile == null) {

1 0

[webwml/master] Deprecate old TBB version
by gk＠torproject.org 19 Jan '15

19 Jan '15

commit f464a370f4fa70837f6db8d89013562791ff4d6d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 19 12:30:50 2015 +0000 Deprecate old TBB version --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 7cb0ac0..4a5eb92 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,6 @@ "4.0.3-Linux", "4.0.3-MacOS", "4.0.3-Windows", -"4.5-alpha-2", -"4.5-alpha-2-Linux", -"4.5-alpha-2-MacOS", -"4.5-alpha-2-Windows" "4.5a3", "4.5a3-Linux", "4.5a3-MacOS",

1 0

[webwml/master] Add new TBB version
by gk＠torproject.org 19 Jan '15

19 Jan '15

commit 07f661bf111532c8ee921133f4183e475dc6145a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 19 09:55:51 2015 +0000 Add new TBB version --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 0075fef..24bc0be 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -24,10 +24,10 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>4.0.3</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5-alpha-2</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5a3</define-tag> <define-tag version-torbrowserbundle whitespace=delete>4.0.3</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>4.5-alpha-2</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>4.5a3</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -39,8 +39,8 @@ <define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.3</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.3</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5-alpha-2</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5-alpha-2</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5a3</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5a3</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -49,7 +49,7 @@ <define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.3</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5-alpha-2</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5a3</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 4785612..7cb0ac0 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,4 +7,8 @@ "4.5-alpha-2-Linux", "4.5-alpha-2-MacOS", "4.5-alpha-2-Windows" +"4.5a3", +"4.5a3-Linux", +"4.5a3-MacOS", +"4.5a3-Windows" ]

1 0