November 2017 - tor-commits - lists.torproject.org

[onionoo/release] Prepare for 4.3-1.7.0 release.
by karsten＠torproject.org 17 Nov '17

17 Nov '17

commit 5b43b4d7f53603831fcbbad45321b12969f13046 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 17 11:33:20 2017 +0100 Prepare for 4.3-1.7.0 release. --- CERT | 20 ++++++++++---------- CHANGELOG.md | 2 +- build.xml | 4 ++-- .../torproject/onionoo/server/ResponseBuilder.java | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CERT b/CERT index d94c0c3..ca92db0 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEZTniETANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIEPrK+4DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU -b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcw -ODE3MTg1MDQ0WhcNMTcxMTE1MTg1MDQ0WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcx +MTE3MTA0MDQ5WhcNMTgwMjE1MTA0MDQ5WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAbsAc -gwl5KJH3pVKw4b+ACCOMgW+27MisCFbT1Izq2Wx+JcLMt3N//MoIpYOZWhsIeazW -/NE0fNbkLi0IYA0F1nUC9pHl44Hd8Gjfqa/YQUi9ALtgsY7l6W0sceW8WnZ8bu8J -DfrqnmB0bD2xc9ZjOn58al8dVjVWs95M87D9WCRU6LiaKFj5c45wciABQsTmC0qD -pyHYOaSGtXxXKDw5pAntdtHkCbowV5tDi/QQ8Tg7i5O7xwSh71Q7TZiNFMpLomBL -QllHfTZryFmoHyGn5MfngBUVCVHig5nXmk0dUMGuLiK4789dkgiPRz0vpB5Yf8Yy -CCE2jB6VBi2g5fMx0w== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAIqRy +T4uMqw1WwZ8CtJx5kSs/or+5025bGK6V2dY/jYapZcbyG7sq3KVFAqLik8Yn7a0D +dfbmtR7r2jbkWhYppa7MGSQ6SMG6nxas05l8yf9ShDnNLtJoay8JyGPeucaFyEwV +VxwN9/I4M4chrrvBzpMB/1U3oJxlKR+nssh4w55DoUijk3vHn01+20EPU9uNJrsr +mXhcrJLU/4R952ZMLxtiBfNP7vaxLpQctNqZxEfa9/rm0pLlfd2t62BWf8kkGqEy +Ke4WdNpQwk3WKjFlKWcvsF6ztJJlwA+qHk4IB9PynVRNggWimBrxWigbeBL8qpML +A5xMtX/MHDXreWGaKA== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index c48075e..1b7c400 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 4.3-1.7.0 - 2017-1?-?? +# Changes in version 4.3-1.7.0 - 2017-11-17 * Medium changes - Support quoted qualified search terms. diff --git a/build.xml b/build.xml index 3e70421..b4ef4d2 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="4.2"/> + <property name="onionoo.protocol.version" value="4.3"/> <property name="release.version" - value="${onionoo.protocol.version}-1.6.1-dev"/> + value="${onionoo.protocol.version}-1.7.0"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index eda71c1..267c359 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -123,7 +123,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "4.2"; + private static final String PROTOCOL_VERSION = "4.3"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2017-12-17";

1 0

[onionoo/release] Add tests for "unreachable_or_addresses" field.
by karsten＠torproject.org 17 Nov '17

17 Nov '17

commit 550d60e01d4e44137739fc6d27c16863793d5a7f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 16 21:33:56 2017 +0100 Add tests for "unreachable_or_addresses" field. --- .../onionoo/writer/DetailsDocumentWriterTest.java | 100 +++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/src/test/java/org/torproject/onionoo/writer/DetailsDocumentWriterTest.java b/src/test/java/org/torproject/onionoo/writer/DetailsDocumentWriterTest.java new file mode 100644 index 0000000..3356a9c --- /dev/null +++ b/src/test/java/org/torproject/onionoo/writer/DetailsDocumentWriterTest.java @@ -0,0 +1,100 @@ +package org.torproject.onionoo.writer; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import org.torproject.onionoo.docs.DetailsDocument; +import org.torproject.onionoo.docs.DetailsStatus; +import org.torproject.onionoo.docs.DocumentStoreFactory; +import org.torproject.onionoo.docs.DummyDocumentStore; + +import org.junit.Before; +import org.junit.Test; + +import java.util.Arrays; +import java.util.TreeSet; + +public class DetailsDocumentWriterTest { + + private DummyDocumentStore documentStore; + + @Before + public void createDummyDocumentStore() { + this.documentStore = new DummyDocumentStore(); + DocumentStoreFactory.setDocumentStore(this.documentStore); + } + + @Test + public void testNoDetailsStatuses() { + DetailsDocumentWriter writer = new DetailsDocumentWriter(); + writer.writeDocuments(); + assertEquals("Without statuses, no documents should be written.", 0, + this.documentStore.getPerformedStoreOperations()); + } + + private static final String GABELMOO_FINGERPRINT = + "F2044413DAC2E02E3D6BCF4735A19BCA1DE97281"; + + private static final String GABELMOO_OR_ADDRESS = + "[2001:638:a000:4140::ffff:189]:443]"; + + @Test + public void testAdvertisedAndReachableOrAddress() { + DetailsStatus status = new DetailsStatus(); + status.setRelay(true); + status.setAdvertisedOrAddresses(Arrays.asList(GABELMOO_OR_ADDRESS)); + status.setOrAddressesAndPorts(new TreeSet<>(Arrays.asList( + GABELMOO_OR_ADDRESS))); + this.documentStore.addDocument(status, GABELMOO_FINGERPRINT); + DetailsDocumentWriter writer = new DetailsDocumentWriter(); + writer.writeDocuments(); + assertEquals("One document should be written.", 1, + this.documentStore.getPerformedStoreOperations()); + DetailsDocument document = this.documentStore.getDocument( + DetailsDocument.class, GABELMOO_FINGERPRINT); + assertNotNull("There should be a document for the given fingerprint.", + document); + assertNull("Document should not contain any unreachable OR addresses.", + document.getUnreachableOrAddresses()); + } + + @Test + public void testUnadvertisedButSomehowReachableOrAddress() { + DetailsStatus status = new DetailsStatus(); + status.setRelay(true); + status.setOrAddressesAndPorts(new TreeSet<>(Arrays.asList( + GABELMOO_OR_ADDRESS))); + this.documentStore.addDocument(status, GABELMOO_FINGERPRINT); + DetailsDocumentWriter writer = new DetailsDocumentWriter(); + writer.writeDocuments(); + assertEquals("One document should be written.", 1, + this.documentStore.getPerformedStoreOperations()); + DetailsDocument document = this.documentStore.getDocument( + DetailsDocument.class, GABELMOO_FINGERPRINT); + assertNotNull("There should be a document for the given fingerprint.", + document); + assertNull("Document should not contain unreachable OR addresses.", + document.getUnreachableOrAddresses()); + } + + @Test + public void testAdvertisedButUnreachableOrAddress() { + DetailsStatus status = new DetailsStatus(); + status.setRelay(true); + status.setAdvertisedOrAddresses(Arrays.asList(GABELMOO_OR_ADDRESS)); + this.documentStore.addDocument(status, GABELMOO_FINGERPRINT); + DetailsDocumentWriter writer = new DetailsDocumentWriter(); + writer.writeDocuments(); + assertEquals("One document should be written.", 1, + this.documentStore.getPerformedStoreOperations()); + DetailsDocument document = this.documentStore.getDocument( + DetailsDocument.class, GABELMOO_FINGERPRINT); + assertNotNull("There should be a document for the given fingerprint.", + document); + assertEquals("Document should contain one unreachable OR address.", + Arrays.asList(GABELMOO_OR_ADDRESS), + document.getUnreachableOrAddresses()); + } +} +

1 0

[onionoo/master] Re-schedule next major version.
by karsten＠torproject.org 17 Nov '17

17 Nov '17

commit a641e1009bcefa8420f9a36b7b24a8a25b85e1ba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 17 11:28:54 2017 +0100 Re-schedule next major version. We said we'd announce new major versions 1 month in advance. Today we're going to put out a release to include this date for the first time. Re-scheduling next major version for in 1 month from today. --- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 12885c5..eda71c1 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -125,7 +125,7 @@ public class ResponseBuilder { private static final String PROTOCOL_VERSION = "4.2"; - private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2017-11-30"; + private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2017-12-17"; private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { this.write(pw, "{\"version\":\"%s\",\n", PROTOCOL_VERSION);

1 0

[onionoo/master] Prepare for 4.3-1.7.0 release.
by karsten＠torproject.org 17 Nov '17

17 Nov '17

commit 5b43b4d7f53603831fcbbad45321b12969f13046 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 17 11:33:20 2017 +0100 Prepare for 4.3-1.7.0 release. --- CERT | 20 ++++++++++---------- CHANGELOG.md | 2 +- build.xml | 4 ++-- .../torproject/onionoo/server/ResponseBuilder.java | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CERT b/CERT index d94c0c3..ca92db0 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEZTniETANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIEPrK+4DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU -b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcw -ODE3MTg1MDQ0WhcNMTcxMTE1MTg1MDQ0WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcx +MTE3MTA0MDQ5WhcNMTgwMjE1MTA0MDQ5WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAbsAc -gwl5KJH3pVKw4b+ACCOMgW+27MisCFbT1Izq2Wx+JcLMt3N//MoIpYOZWhsIeazW -/NE0fNbkLi0IYA0F1nUC9pHl44Hd8Gjfqa/YQUi9ALtgsY7l6W0sceW8WnZ8bu8J -DfrqnmB0bD2xc9ZjOn58al8dVjVWs95M87D9WCRU6LiaKFj5c45wciABQsTmC0qD -pyHYOaSGtXxXKDw5pAntdtHkCbowV5tDi/QQ8Tg7i5O7xwSh71Q7TZiNFMpLomBL -QllHfTZryFmoHyGn5MfngBUVCVHig5nXmk0dUMGuLiK4789dkgiPRz0vpB5Yf8Yy -CCE2jB6VBi2g5fMx0w== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAIqRy +T4uMqw1WwZ8CtJx5kSs/or+5025bGK6V2dY/jYapZcbyG7sq3KVFAqLik8Yn7a0D +dfbmtR7r2jbkWhYppa7MGSQ6SMG6nxas05l8yf9ShDnNLtJoay8JyGPeucaFyEwV +VxwN9/I4M4chrrvBzpMB/1U3oJxlKR+nssh4w55DoUijk3vHn01+20EPU9uNJrsr +mXhcrJLU/4R952ZMLxtiBfNP7vaxLpQctNqZxEfa9/rm0pLlfd2t62BWf8kkGqEy +Ke4WdNpQwk3WKjFlKWcvsF6ztJJlwA+qHk4IB9PynVRNggWimBrxWigbeBL8qpML +A5xMtX/MHDXreWGaKA== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index c48075e..1b7c400 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 4.3-1.7.0 - 2017-1?-?? +# Changes in version 4.3-1.7.0 - 2017-11-17 * Medium changes - Support quoted qualified search terms. diff --git a/build.xml b/build.xml index 3e70421..b4ef4d2 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="4.2"/> + <property name="onionoo.protocol.version" value="4.3"/> <property name="release.version" - value="${onionoo.protocol.version}-1.6.1-dev"/> + value="${onionoo.protocol.version}-1.7.0"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index eda71c1..267c359 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -123,7 +123,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "4.2"; + private static final String PROTOCOL_VERSION = "4.3"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2017-12-17";

1 0

[tor/master] Add smartlist_add() to get_lspecs_from_node)
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 27d34f36e07b876321a03fbb59533b72b807b679 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Nov 16 12:37:39 2017 -0500 Add smartlist_add() to get_lspecs_from_node) --- src/or/hs_circuit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index 26fe22eb7..9e7709504 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -617,6 +617,7 @@ get_lspecs_from_node(const node_t *node, smartlist_t *lspecs) link_specifier_set_un_ipv6_port(ls, ap.port); /* Sixteen bytes IPv6 and two bytes port. */ link_specifier_set_ls_len(ls, addr_len + sizeof(ap.port)); + smartlist_add(lspecs, ls); } }

1 0

[tor/master] Use memset() on intro1_data in hs_circ_send_introduce1()
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit b8addf97463d9338558ec7c0b97b48eaa476fc55 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Nov 16 12:58:37 2017 -0500 Use memset() on intro1_data in hs_circ_send_introduce1() --- src/or/hs_circuit.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index 9e7709504..7f5bbdaaf 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -1101,6 +1101,11 @@ hs_circ_send_introduce1(origin_circuit_t *intro_circ, tor_assert(ip); tor_assert(subcredential); + /* It is undefined behavior in hs_cell_introduce1_data_clear() if intro1_data + * has been declared on the stack but not initialized. Here, we set it to 0. + */ + memset(&intro1_data, 0, sizeof(hs_cell_introduce1_data_t)); + /* This takes various objects in order to populate the introduce1 data * object which is used to build the content of the cell. */ const node_t *exit_node = build_state_get_exit_node(rend_circ->build_state);

1 0

[tor/master] Add error message for exit_node in hs_circ_send_introduce1()
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit eb793c31cf9230a2bb4bda554379056f044f5473 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Nov 16 13:13:31 2017 -0500 Add error message for exit_node in hs_circ_send_introduce1() --- src/or/hs_circuit.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index 7f5bbdaaf..a232a40c8 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -1109,6 +1109,11 @@ hs_circ_send_introduce1(origin_circuit_t *intro_circ, /* This takes various objects in order to populate the introduce1 data * object which is used to build the content of the cell. */ const node_t *exit_node = build_state_get_exit_node(rend_circ->build_state); + if (exit_node == NULL) { + log_info(LD_REND, "Unable to get rendezvous point for circuit %u. " + "Failing.", TO_CIRCUIT(intro_circ)->n_circ_id); + goto done; + } setup_introduce1_data(ip, exit_node, subcredential, &intro1_data); /* If we didn't get any link specifiers, it's because our node was * bad. */

1 0

[webwml/staging] Fix dropdown padding and language nav
by hiro＠torproject.org 17 Nov '17

17 Nov '17

commit 101d5558dcc93fe5202c31461c4d5ed443e1e8f8 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Nov 17 14:37:54 2017 +0100 Fix dropdown padding and language nav --- css/layout.css | 5 ++++- css/layout.min.css | 2 +- include/dlhead.wmi | 4 ++-- include/navigation.wmi | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/css/layout.css b/css/layout.css index d56ffdb3..46a32d37 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1315,7 +1315,7 @@ p.blogDate { /* Style The Dropdown Button */ .dropbtn { background-color: white; - padding: 0px; + padding: 16px 0 0 0; font-size: 100%; border: none; cursor: pointer; @@ -1325,6 +1325,9 @@ p.blogDate { .dropdown { position: relative; display: inline-block; + padding: 0; + margin-top: -16px; + top: 0; } /* Dropdown Content (Hidden by Default) */ diff --git a/css/layout.min.css b/css/layout.min.css index 9811d53e..e13dc744 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -1 +1 @@ -@charset "UTF-8";body{background:#fff}#wrap{width:960px;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.jpg) left top no-repeat;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:130px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width:100px;margin-left:0}#callt oaction ul li a:link,#calltoaction ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top center no-repeat #885ca4;padding:4px 8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction ul li:hover:first-child a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat #885ca4}#calltoaction ul li:hover:first-child a{background:url(../images/cta-buttons.jpg) bottom le ft no-repeat #ff9800}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul li:hover:last-child a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat #885ca4;color:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{background:url(../images/button-d ownload-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;margin-bottom:20px}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol{width:280px;float:left;mar gin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right!important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px!important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock{padding:15px;width:188px}.im g-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line-height:16px}#sidenav ul li.ac tive{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.project{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webk it-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{background:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom :0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_float:none;background:#fff;display:block}.accordionContent .fauxhead{width:710px}.package{float:left;height:280px;margin:0;padding:25px 20px 20px 20px;border-top:1px solid #888}.package h2{margin-bottom:3px}.packa ge p{margin-top:16px;padding-left:10px}.downloads{display:block;float:left;width:238px;padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding:10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0}.easy{width:712px;margin-bottom:10px;padding-bottom:8px}#download-donate{background-at tachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.easy .package h2,.easy .package em{display:block;width:100%;text-align:left}.easy .package h2{padding-top:10px;padding-bottom:5px}.easy .package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.easy .package p{padding-left:0;font-size:15px;text-align:justify}.easy .package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.easy .package{float:none;padding:0 8px 0 12px}.open{display:block}.lang-alt{line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-t itle-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}.warning{float:left;_float:none;padding:25px 25px;margin-top:4px}.warning p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;widt h:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px; border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-decoration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.d box h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;width:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padd ing:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align:center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:tran sparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px}p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projec tbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projectdesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block} \ No newline at end of file +@charset "UTF-8";body{background:#fff}#wrap{width:960px;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.jpg) left top no-repeat;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:130px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width:100px;margin-left:0}#callt oaction ul li a:link,#calltoaction ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top center no-repeat #885ca4;padding:4px 8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction ul li:hover:first-child a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat #885ca4}#calltoaction ul li:hover:first-child a{background:url(../images/cta-buttons.jpg) bottom le ft no-repeat #ff9800}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul li:hover:last-child a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat #885ca4;color:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{background:url(../images/button-d ownload-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;margin-bottom:20px}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol{width:280px;float:left;mar gin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right!important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px!important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock{padding:15px;width:188px}.im g-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line-height:16px}#sidenav ul li.ac tive{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.project{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webk it-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{background:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom :0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_float:none;background:#fff;display:block}.accordionContent .fauxhead{width:710px}.package{float:left;height:280px;margin:0;padding:25px 20px 20px 20px;border-top:1px solid #888}.package h2{margin-bottom:3px}.packa ge p{margin-top:16px;padding-left:10px}.downloads{display:block;float:left;width:238px;padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding:10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0}.easy{width:712px;margin-bottom:10px;padding-bottom:8px}#download-donate{background-at tachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.easy .package h2,.easy .package em{display:block;width:100%;text-align:left}.easy .package h2{padding-top:10px;padding-bottom:5px}.easy .package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.easy .package p{padding-left:0;font-size:15px;text-align:justify}.easy .package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.easy .package{float:none;padding:0 8px 0 12px}.open{display:block}.lang-alt{line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-t itle-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}.warning{float:left;_float:none;padding:25px 25px;margin-top:4px}.warning p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;widt h:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px; border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-decoration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.d box h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;width:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padd ing:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align:center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:tran sparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px}p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projec tbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projectdesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block} \ No newline at end of file diff --git a/include/dlhead.wmi b/include/dlhead.wmi index dd67af9c..fc51cae8 100644 --- a/include/dlhead.wmi +++ b/include/dlhead.wmi @@ -118,13 +118,13 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), # LANGUAGE SWITCH <li> <div class="dropdown"> - <div class="dropbtn"> + <button class="dropbtn"> <:{ if (has_translations()) { my @lngs = list_translations(); print $lngs[0]; } }:> - </div> + </button> <div class="dropdown-content"> <:{ #import "perl-globals.wmi"; diff --git a/include/navigation.wmi b/include/navigation.wmi index 36b985b1..456b4f04 100644 --- a/include/navigation.wmi +++ b/include/navigation.wmi @@ -12,6 +12,7 @@ 'docs/documentation' , 'Documentation', 'press/press' , 'Press', '<blog>' , 'Blog', + '<newsletter>' , 'Newsletter', 'about/contact' , 'Contact', ); my @donatenav = (

1 0

[tor/maint-0.3.2] Fix a traceback when closing a blocked connection "immediately".
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events immediately. But if it had been blocked on bandwidth read/write, we could try to re-add its (nonexistent) events later from connection_bucket_refill -- if we got to that callback before we swept the marked connections. Fixes bug 24167. Fortunately, this hasn't been a crash bug since we introduced connection_check_event in 0.2.9.10, and backported it. This is a bugfix on commit 89d422914a0c3cb, I believe, which appeared in Tor 0.1.0.1-rc. --- changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug24167 b/changes/bug24167 new file mode 100644 index 000000000..fd0d87eff --- /dev/null +++ b/changes/bug24167 @@ -0,0 +1,7 @@ + o Minor bugfixes (network layer): + - When closing a connection via close_connection_immediately(), we + mark it as "not blocked on bandwidth", to prevent later calls + from trying to unblock it, and give it permission to read. This + fixes a backtrace warning that can happen on relays under various + circumstances. Fixes bug 24167; bugfix on 0.1.0.1-rc. + diff --git a/src/or/connection.c b/src/or/connection.c index 276dca281..61f4f5aa6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -721,6 +721,10 @@ connection_close_immediate(connection_t *conn) connection_unregister_events(conn); + /* Prevent the event from getting unblocked. */ + conn->read_blocked_on_bw = + conn->write_blocked_on_bw = 0; + if (SOCKET_OK(conn->s)) tor_close_socket(conn->s); conn->s = TOR_INVALID_SOCKET;

1 0

[tor/release-0.3.2] Merge branch 'bug24167_025' into maint-0.3.2
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 3a364309ace5bc0b75b724484d6b27d84ec6a8b1 Merge: 057101581 95238eb91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 17 08:35:52 2017 -0500 Merge branch 'bug24167_025' into maint-0.3.2 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0