[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

[translation]

commit 273233dba9d7bcf6024d4ca7e1e832c5891bf097
Author: Translation commit bot 
Date:   Thu Apr 5 23:45:49 2018 +

Update translations for tails-persistence-setup
---
 ti/ti.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ti/ti.po b/ti/ti.po
index 93929869e..d193b1ec5 100644
--- a/ti/ti.po
+++ b/ti/ti.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2018-02-20 18:51+\n"
-"Last-Translator: mulugetta tsegay \n"
+"PO-Revision-Date: 2018-04-05 23:31+\n"
+"Last-Translator: Thewodros Aregay \n"
 "Language-Team: Tigrinya 
(http://www.transifex.com/otf/torproject/language/ti/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] fix confusing comment

[arma]

commit 0b0e4886cfd78687f8ba80da1988524bb15aa17c
Author: Roger Dingledine 
Date:   Thu Apr 5 15:59:37 2018 -0400

fix confusing comment

presumably introduced by copy-and-paste mistake
---
 src/or/entrynodes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 2b6ff38c9..88d1b94de 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -2334,7 +2334,7 @@ entry_guard_cancel(circuit_guard_state_t **guard_state_p)
 }
 
 /**
- * Called by the circuit building module when a circuit has succeeded:
+ * Called by the circuit building module when a circuit has failed:
  * informs the guards code that the guard in *guard_state_p is
  * not working, and advances the state of the guard module.
  */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [nyx/master] Link to openports.se for OpenBSD

[atagar]

commit ef24087473dbbda59a6d227b08861af5b708c410
Author: Damian Johnson 
Date:   Thu Apr 5 12:38:16 2018 -0700

Link to openports.se for OpenBSD

Seems like a nicer landing page to link to. It directs folks to CSVweb if 
they
want it.
---
 web/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/index.html b/web/index.html
index a45f143..50eae11 100644
--- a/web/index.html
+++ b/web/index.html
@@ -418,8 +418,8 @@ sudo python setup.py install
   
 
   
-https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/nyx/; 
id="openbsd">
-https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/nyx/; 
class="platform-title">OpenBSD
+http://openports.se/net/nyx; id="openbsd">
+http://openports.se/net/nyx; 
class="platform-title">OpenBSD
 Port maintained by pascal for OpenBSD.
 % pkg_add nyx
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Fetch descriptors from both CollecTor instances.

[karsten]

commit 520c1577c119f46f5de8db83ee9d4eb498a30e7a
Author: Karsten Loesing 
Date:   Tue Apr 3 15:19:36 2018 +0200

Fetch descriptors from both CollecTor instances.

Fixes #25700.
---
 CHANGELOG.md   |  1 +
 .../onionoo/updater/DescriptorSource.java  | 85 +++---
 2 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36d6471..ac15a8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
  * Medium changes
- Add version_status field to details documents.
+   - Fetch descriptors from both CollecTor instances.
 
  * Minor changes
- Don't attempt to un-escape character sequences in contact lines
diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java 
b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java
index 6bddd02..20e249d 100644
--- a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java
+++ b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java
@@ -25,32 +25,54 @@ public class DescriptorSource {
 
   private final File inDir = new File("in");
 
-  private final File inRecentDir = new File(inDir, "recent");
+  private final String[] collecTorHosts = new String[] {
+  "collector.torproject.org", "collector2.torproject.org" };
+
+  private File[] inCollecTorHostDirs;
+
+  private File[] inCollecTorHostRecentDirs;
+
+  private List recentDescriptorQueues;
 
   private final File inArchiveDir = new File(inDir, "archive");
 
   private final File statusDir = new File("status");
 
-  private List descriptorQueues;
-
   private DescriptorQueue archiveDescriptorQueue;
 
   /** Instantiates a new descriptor source. */
   public DescriptorSource() {
-this.descriptorQueues = new ArrayList<>();
+this.inCollecTorHostDirs = new File[this.collecTorHosts.length];
+this.inCollecTorHostRecentDirs = new File[this.collecTorHosts.length];
+for (int collecTorHostIndex = 0;
+ collecTorHostIndex < this.collecTorHosts.length;
+ collecTorHostIndex++) {
+  this.inCollecTorHostDirs[collecTorHostIndex]
+  = new File(this.statusDir, this.collecTorHosts[collecTorHostIndex]);
+  this.inCollecTorHostRecentDirs[collecTorHostIndex]
+  = new File(this.inCollecTorHostDirs[collecTorHostIndex], "recent");
+}
+this.recentDescriptorQueues = new ArrayList<>();
 this.descriptorListeners = new HashMap<>();
   }
 
-  private DescriptorQueue getDescriptorQueue(
+  private List getDescriptorQueues(
   DescriptorType descriptorType,
   DescriptorHistory descriptorHistory) {
-DescriptorQueue descriptorQueue = new DescriptorQueue(
-this.inRecentDir, descriptorType, this.statusDir);
-if (descriptorHistory != null) {
-  descriptorQueue.readHistoryFile(descriptorHistory);
+List descriptorQueues = new ArrayList<>();
+for (int collecTorHostIndex = 0;
+ collecTorHostIndex < this.collecTorHosts.length;
+ collecTorHostIndex++) {
+  DescriptorQueue descriptorQueue = new DescriptorQueue(
+  this.inCollecTorHostRecentDirs[collecTorHostIndex], descriptorType,
+  this.inCollecTorHostDirs[collecTorHostIndex]);
+  if (descriptorHistory != null) {
+descriptorQueue.readHistoryFile(descriptorHistory);
+  }
+  descriptorQueues.add(descriptorQueue);
 }
-this.descriptorQueues.add(descriptorQueue);
-return descriptorQueue;
+this.recentDescriptorQueues.addAll(descriptorQueues);
+return descriptorQueues;
   }
 
   private Map
@@ -68,14 +90,24 @@ public class DescriptorSource {
 
   /** Downloads descriptors from CollecTor. */
   public void downloadDescriptors() {
-List remoteDirectories = new ArrayList<>();
+List remoteDirectoriesList = new ArrayList<>();
 for (DescriptorType descriptorType : DescriptorType.values()) {
-  remoteDirectories.add("/recent/" + descriptorType.getDir());
+  remoteDirectoriesList.add("/recent/" + descriptorType.getDir());
+}
+for (int collecTorHostIndex = 0;
+ collecTorHostIndex < this.collecTorHosts.length;
+ collecTorHostIndex++) {
+  String collecTorBaseUrl = "https://;
+  + this.collecTorHosts[collecTorHostIndex];
+  String[] remoteDirectories = remoteDirectoriesList.toArray(new 
String[0]);
+  long minLastModified = 0L;
+  File localDirectory = this.inCollecTorHostDirs[collecTorHostIndex];
+  boolean deleteExtraneousLocalFiles = true;
+  DescriptorCollector dc = 
org.torproject.descriptor.DescriptorSourceFactory
+  .createDescriptorCollector();
+  dc.collectDescriptors(collecTorBaseUrl, remoteDirectories,
+  minLastModified, localDirectory, deleteExtraneousLocalFiles);
 }
-DescriptorCollector dc = org.torproject.descriptor.DescriptorSourceFactory
-.createDescriptorCollector();
-

[tor-commits] [tor/master] Document a requirement for cells to be encrypted.

[nickm]

commit a9fa483004b0951c3fc7f8a9f5a097b917da6fa8
Author: Nick Mathewson 
Date:   Sat Mar 24 13:49:44 2018 -0400

Document a requirement for cells to be encrypted.
---
 src/or/relay_crypto.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/or/relay_crypto.c b/src/or/relay_crypto.c
index 9d61ecd42..c42a4f9cc 100644
--- a/src/or/relay_crypto.c
+++ b/src/or/relay_crypto.c
@@ -170,6 +170,9 @@ relay_decrypt_cell(circuit_t *circ, cell_t *cell,
 /**
  * Encrypt a cell cell that we are creating, and sending outbound on
  * circ until the hop corresponding to layer_hint.
+ *
+ * The integrity field and recognized field of cell's relay headers
+ * must be set to zero.
  */
 void
 relay_encrypt_cell_outbound(cell_t *cell,
@@ -193,6 +196,9 @@ relay_encrypt_cell_outbound(cell_t *cell,
 /**
  * Encrypt a cell cell that we are creating, and sending on
  * circuit to the origin.
+ *
+ * The integrity field and recognized field of cell's relay headers
+ * must be set to zero.
  */
 void
 relay_encrypt_cell_inbound(cell_t *cell,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Extract the crypto parts of circuit_package_relay_cell.

[nickm]

commit 320dcf65b7c8e382b27260a037bd1e93e563ccb9
Author: Nick Mathewson 
Date:   Sat Mar 17 10:14:35 2018 -0400

Extract the crypto parts of circuit_package_relay_cell.
---
 src/or/relay.c   | 57 ++--
 src/or/relay.h   |  8 ++--
 src/test/bench.c |  3 ++-
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index fad8b38b4..9431c93be 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -487,6 +487,42 @@ relay_decrypt_cell(circuit_t *circ, cell_t *cell,
   return 0;
 }
 
+/**
+ * Encrypt a cell cell that we are creating, and sending outbound on
+ * circ until the hop corresponding to layer_hint.
+ */
+void
+relay_encrypt_cell_outbound(cell_t *cell,
+origin_circuit_t *circ,
+crypt_path_t *layer_hint)
+{
+  crypt_path_t *thishop; /* counter for repeated crypts */
+  relay_set_digest(layer_hint->f_digest, cell);
+
+  thishop = layer_hint;
+  /* moving from farthest to nearest hop */
+  do {
+tor_assert(thishop);
+log_debug(LD_OR,"encrypting a layer of the relay cell.");
+relay_crypt_one_payload(thishop->f_crypto, cell->payload);
+
+thishop = thishop->prev;
+  } while (thishop != circ->cpath->prev);
+}
+
+/**
+ * Encrypt a cell cell that we are creating, and sending on
+ * circuit to the origin.
+ */
+void
+relay_encrypt_cell_inbound(cell_t *cell,
+   or_circuit_t *or_circ)
+{
+  relay_set_digest(or_circ->p_digest, cell);
+  /* encrypt one layer */
+  relay_crypt_one_payload(or_circ->p_crypto, cell->payload);
+}
+
 /** Package a relay cell from an edge:
  *  - Encrypt it to the right layer
  *  - Append it to the appropriate cell_queue on circ.
@@ -505,7 +541,6 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
   }
 
   if (cell_direction == CELL_DIRECTION_OUT) {
-crypt_path_t *thishop; /* counter for repeated crypts */
 chan = circ->n_chan;
 if (!chan) {
   log_warn(LD_BUG,"outgoing relay cell sent from %s:%d has n_chan==NULL."
@@ -528,20 +563,8 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
   return 0; /* just drop it */
 }
 
-relay_set_digest(layer_hint->f_digest, cell);
-
-thishop = layer_hint;
-/* moving from farthest to nearest hop */
-do {
-  tor_assert(thishop);
-  log_debug(LD_OR,"encrypting a layer of the relay cell.");
-  relay_crypt_one_payload(thishop->f_crypto, cell->payload);
-
-  thishop = thishop->prev;
-} while (thishop != TO_ORIGIN_CIRCUIT(circ)->cpath->prev);
-
+relay_encrypt_cell_outbound(cell, TO_ORIGIN_CIRCUIT(circ), layer_hint);
   } else { /* incoming cell */
-or_circuit_t *or_circ;
 if (CIRCUIT_IS_ORIGIN(circ)) {
   /* We should never package an _incoming_ cell from the circuit
* origin; that means we messed up somewhere. */
@@ -549,11 +572,9 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
   assert_circuit_ok(circ);
   return 0; /* just drop it */
 }
-or_circ = TO_OR_CIRCUIT(circ);
+or_circuit_t *or_circ = TO_OR_CIRCUIT(circ);
+relay_encrypt_cell_inbound(cell, or_circ);
 chan = or_circ->p_chan;
-relay_set_digest(or_circ->p_digest, cell);
-/* encrypt one layer */
-relay_crypt_one_payload(or_circ->p_crypto, cell->payload);
   }
   ++stats_n_relay_cells_relayed;
 
diff --git a/src/or/relay.h b/src/or/relay.h
index f0fa7e987..ff4d011f7 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -90,8 +90,12 @@ void circuit_clear_cell_queue(circuit_t *circ, channel_t 
*chan);
 
 void stream_choice_seed_weak_rng(void);
 
-int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction,
-crypt_path_t **layer_hint, char *recognized);
+int relay_decrypt_cell(circuit_t *circ, cell_t *cell,
+   cell_direction_t cell_direction,
+   crypt_path_t **layer_hint, char *recognized);
+void relay_encrypt_cell_outbound(cell_t *cell, origin_circuit_t *or_circ,
+crypt_path_t *layer_hint);
+void relay_encrypt_cell_inbound(cell_t *cell, or_circuit_t *or_circ);
 
 circid_t packed_cell_get_circid(const packed_cell_t *cell, int wide_circ_ids);
 
diff --git a/src/test/bench.c b/src/test/bench.c
index 24ff8b255..ad3732568 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -518,7 +518,8 @@ bench_cell_ops(void)
 for (i = 0; i < iters; ++i) {
   char recognized = 0;
   crypt_path_t *layer_hint = NULL;
-  relay_crypt(TO_CIRCUIT(or_circ), cell, d, _hint, );
+  relay_decrypt_cell(TO_CIRCUIT(or_circ), cell, d,
+ _hint, );
 }
 end = perftime();
 printf("%sbound cells: %.2f ns per cell. (%.2f ns per byte of payload)\n",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Rename 'relay_crypt' to 'relay_decrypt_cell'

[nickm]

commit 298932605495dc9ef3e8e068c36a80a517036195
Author: Nick Mathewson 
Date:   Sat Mar 17 10:03:53 2018 -0400

Rename 'relay_crypt' to 'relay_decrypt_cell'

This function is used upon receiving a cell, and only handles the
decrypting part.  The encryption part is currently handled inside
circuit_package_relay_cell.
---
 src/or/relay.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c
index 7c21839a8..fad8b38b4 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -299,7 +299,8 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
   if (circ->marked_for_close)
 return 0;
 
-  if (relay_crypt(circ, cell, cell_direction, _hint, ) < 0) {
+  if (relay_decrypt_cell(circ, cell, cell_direction, _hint, )
+  < 0) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"relay crypt failed. Dropping connection.");
 return -END_CIRC_REASON_INTERNAL;
@@ -422,8 +423,9 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
  * else return 0.
  */
 int
-relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction,
-crypt_path_t **layer_hint, char *recognized)
+relay_decrypt_cell(circuit_t *circ, cell_t *cell,
+   cell_direction_t cell_direction,
+   crypt_path_t **layer_hint, char *recognized)
 {
   relay_header_t rh;
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'public/split_relay_crypto'

[nickm]

commit c6d7e0becf33409f87c41c369cd3b561f477df2b
Merge: 2933f73b3 a9fa48300
Author: Nick Mathewson 
Date:   Thu Apr 5 12:12:18 2018 -0400

Merge remote-tracking branch 'public/split_relay_crypto'

 src/or/circuitbuild.c  |  77 +--
 src/or/circuitlist.c   |  19 +--
 src/or/include.am  |   2 +
 src/or/or.h|  36 +++--
 src/or/relay.c | 179 +
 src/or/relay.h |   3 -
 src/or/relay_crypto.c  | 326 +
 src/or/relay_crypto.h  |  31 +
 src/test/bench.c   |  18 ++-
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test.h|   1 +
 src/test/test_hs_client.c  |  16 +--
 src/test/test_hs_service.c |   8 +-
 src/test/test_relaycrypt.c | 184 +
 15 files changed, 597 insertions(+), 305 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Move relay-crypto functions from relay.[ch] to relay_crypto.[ch]

[nickm]

commit 80955be6ecae7095d267981b39d10237aabc38a6
Author: Nick Mathewson 
Date:   Sat Mar 17 10:21:57 2018 -0400

Move relay-crypto functions from relay.[ch] to relay_crypto.[ch]

This should help us improve modularity, and should also make it
easier for people to experiment with other relay crypto strategies
down the road.

This commit is pure function movement.
---
 src/or/include.am |   2 +
 src/or/relay.c| 192 +--
 src/or/relay.h|   7 --
 src/or/relay_crypto.c | 202 ++
 src/or/relay_crypto.h |  23 ++
 src/test/bench.c  |   2 +-
 6 files changed, 229 insertions(+), 199 deletions(-)

diff --git a/src/or/include.am b/src/or/include.am
index e0366a0ca..77a9dcc0b 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -91,6 +91,7 @@ LIBTOR_A_SOURCES = \
src/or/policies.c   \
src/or/reasons.c\
src/or/relay.c  \
+   src/or/relay_crypto.c   \
src/or/rendcache.c  \
src/or/rendclient.c \
src/or/rendcommon.c \
@@ -237,6 +238,7 @@ ORHEADERS = \
src/or/proto_socks.h\
src/or/reasons.h\
src/or/relay.h  \
+   src/or/relay_crypto.h   \
src/or/rendcache.h  \
src/or/rendclient.h \
src/or/rendcommon.h \
diff --git a/src/or/relay.c b/src/or/relay.c
index 9431c93be..5f241423a 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -70,6 +70,7 @@
 #include "policies.h"
 #include "reasons.h"
 #include "relay.h"
+#include "relay_crypto.h"
 #include "rendcache.h"
 #include "rendcommon.h"
 #include "router.h"
@@ -122,79 +123,6 @@ uint64_t stats_n_relay_cells_delivered = 0;
 /** Used to tell which stream to read from first on a circuit. */
 static tor_weak_rng_t stream_choice_rng = TOR_WEAK_RNG_INIT;
 
-/** Update digest from the payload of cell. Assign integrity part to
- * cell.
- */
-static void
-relay_set_digest(crypto_digest_t *digest, cell_t *cell)
-{
-  char integrity[4];
-  relay_header_t rh;
-
-  crypto_digest_add_bytes(digest, (char*)cell->payload, CELL_PAYLOAD_SIZE);
-  crypto_digest_get_digest(digest, integrity, 4);
-//  log_fn(LOG_DEBUG,"Putting digest of %u %u %u %u into relay cell.",
-//integrity[0], integrity[1], integrity[2], integrity[3]);
-  relay_header_unpack(, cell->payload);
-  memcpy(rh.integrity, integrity, 4);
-  relay_header_pack(cell->payload, );
-}
-
-/** Does the digest for this circuit indicate that this cell is for us?
- *
- * Update digest from the payload of cell (with the integrity part set
- * to 0). If the integrity part is valid, return 1, else restore digest
- * and cell to their original state and return 0.
- */
-static int
-relay_digest_matches(crypto_digest_t *digest, cell_t *cell)
-{
-  uint32_t received_integrity, calculated_integrity;
-  relay_header_t rh;
-  crypto_digest_checkpoint_t backup_digest;
-
-  crypto_digest_checkpoint(_digest, digest);
-
-  relay_header_unpack(, cell->payload);
-  memcpy(_integrity, rh.integrity, 4);
-  memset(rh.integrity, 0, 4);
-  relay_header_pack(cell->payload, );
-
-//  log_fn(LOG_DEBUG,"Reading digest of %u %u %u %u from relay cell.",
-//received_integrity[0], received_integrity[1],
-//received_integrity[2], received_integrity[3]);
-
-  crypto_digest_add_bytes(digest, (char*) cell->payload, CELL_PAYLOAD_SIZE);
-  crypto_digest_get_digest(digest, (char*) _integrity, 4);
-
-  int rv = 1;
-
-  if (calculated_integrity != received_integrity) {
-//log_fn(LOG_INFO,"Recognized=0 but bad digest. Not recognizing.");
-// (%d vs %d).", received_integrity, calculated_integrity);
-/* restore digest to its old form */
-crypto_digest_restore(digest, _digest);
-/* restore the relay header */
-memcpy(rh.integrity, _integrity, 4);
-relay_header_pack(cell->payload, );
-rv = 0;
-  }
-
-  memwipe(_digest, 0, sizeof(backup_digest));
-  return rv;
-}
-
-/** Apply cipher to CELL_PAYLOAD_SIZE bytes of in
- * (in place).
- *
- * Note that we use the same operation for encrypting and for decrypting.
- */
-static void
-relay_crypt_one_payload(crypto_cipher_t *cipher, uint8_t *in)
-{
-  crypto_cipher_crypt_inplace(cipher, (char*) in, CELL_PAYLOAD_SIZE);
-}
-
 /**
  * Update channel usage state based on the type of relay cell and
  * circuit properties.
@@ -405,124 +333,6 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
   return 0;
 }
 
-/** Do the appropriate en/decryptions for cell arriving on
- * circ in direction cell_direction.
- *
- * If cell_direction == 

[tor-commits] [tor/master] Basic unit tests for relay_crypto.c

[nickm]

commit 7db4d0c55f1e0146ecd0207f788075b672411cc2
Author: Nick Mathewson 
Date:   Sat Mar 17 11:23:05 2018 -0400

Basic unit tests for relay_crypto.c

These tests handle incoming and outgoing cells on a three-hop
circuit, and make sure that the crypto works end-to-end.  They don't
yet test spec conformance, leaky-pipe, or various error cases.
---
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test.h|   1 +
 src/test/test_relaycrypt.c | 184 +
 4 files changed, 187 insertions(+)

diff --git a/src/test/include.am b/src/test/include.am
index 1a49367c6..0c74460dc 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -150,6 +150,7 @@ src_test_test_SOURCES = \
src/test/test_pubsub.c \
src/test/test_relay.c \
src/test/test_relaycell.c \
+   src/test/test_relaycrypt.c \
src/test/test_rendcache.c \
src/test/test_replay.c \
src/test/test_router.c \
diff --git a/src/test/test.c b/src/test/test.c
index 2712de4ed..655fd9898 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1242,6 +1242,7 @@ struct testgroup_t testgroups[] = {
   { "pt/", pt_tests },
   { "relay/" , relay_tests },
   { "relaycell/", relaycell_tests },
+  { "relaycrypt/", relaycrypt_tests },
   { "rend_cache/", rend_cache_tests },
   { "replaycache/", replaycache_tests },
   { "router/", router_tests },
diff --git a/src/test/test.h b/src/test/test.h
index 26139fc5f..72f806362 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -237,6 +237,7 @@ extern struct testcase_t pubsub_tests[];
 extern struct testcase_t pt_tests[];
 extern struct testcase_t relay_tests[];
 extern struct testcase_t relaycell_tests[];
+extern struct testcase_t relaycrypt_tests[];
 extern struct testcase_t rend_cache_tests[];
 extern struct testcase_t replaycache_tests[];
 extern struct testcase_t router_tests[];
diff --git a/src/test/test_relaycrypt.c b/src/test/test_relaycrypt.c
new file mode 100644
index 0..eba989718
--- /dev/null
+++ b/src/test/test_relaycrypt.c
@@ -0,0 +1,184 @@
+/* Copyright 2001-2004 Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2018, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#include "or.h"
+#include "circuitbuild.h"
+#define CIRCUITLIST_PRIVATE
+#include "circuitlist.h"
+#include "relay.h"
+#include "relay_crypto.h"
+#include "test.h"
+
+static const char KEY_MATERIAL[3][CPATH_KEY_MATERIAL_LEN] = {
+  "'My public key is in this signed x509 object', said Tom assertively.",
+  "'Let's chart the pedal phlanges in the tomb', said Tom cryptographically",
+  " 'Segmentation fault bugs don't _just happen_', said Tom seethingly.",
+};
+
+typedef struct testing_circuitset_t {
+  or_circuit_t *or_circ[3];
+  origin_circuit_t *origin_circ;
+} testing_circuitset_t;
+
+static int testing_circuitset_teardown(const struct testcase_t *testcase,
+   void *ptr);
+
+static void *
+testing_circuitset_setup(const struct testcase_t *testcase)
+{
+  testing_circuitset_t *cs = tor_malloc_zero(sizeof(testing_circuitset_t));
+  int i;
+
+  for (i=0; i<3; ++i) {
+cs->or_circ[i] = or_circuit_new(0, NULL);
+tt_int_op(0, OP_EQ,
+  relay_crypto_init(>or_circ[i]->crypto,
+KEY_MATERIAL[i], sizeof(KEY_MATERIAL[i]),
+0, 0));
+  }
+
+  cs->origin_circ = origin_circuit_new();
+  cs->origin_circ->base_.purpose = CIRCUIT_PURPOSE_C_GENERAL;
+  for (i=0; i<3; ++i) {
+crypt_path_t *hop = tor_malloc_zero(sizeof(*hop));
+relay_crypto_init(>crypto, KEY_MATERIAL[i], sizeof(KEY_MATERIAL[i]),
+  0, 0);
+hop->state = CPATH_STATE_OPEN;
+onion_append_to_cpath(>origin_circ->cpath, hop);
+tt_ptr_op(hop, OP_EQ, cs->origin_circ->cpath->prev);
+  }
+
+  return cs;
+ done:
+  testing_circuitset_teardown(testcase, cs);
+  return NULL;
+}
+
+static int
+testing_circuitset_teardown(const struct testcase_t *testcase, void *ptr)
+{
+  (void)testcase;
+  testing_circuitset_t *cs = ptr;
+  int i;
+  for (i=0; i<3; ++i) {
+circuit_free_(TO_CIRCUIT(cs->or_circ[i]));
+  }
+  circuit_free_(TO_CIRCUIT(cs->origin_circ));
+  tor_free(cs);
+  return 1;
+}
+
+static const struct testcase_setup_t relaycrypt_setup = {
+  testing_circuitset_setup, testing_circuitset_teardown
+};
+
+/* Test encrypting a cell to the final hop on a circuit, decrypting it
+ * at each hop, and recognizing it at the other end.  Then do it again
+ * and again as the state evolves. */
+static void
+test_relaycrypt_outbound(void *arg)
+{
+  testing_circuitset_t *cs = arg;
+  tt_assert(cs);
+
+  relay_header_t rh;
+  cell_t orig;
+  cell_t encrypted;
+  int i, j;
+
+  for (i = 0; i < 50; ++i) {
+crypto_rand((char *), sizeof(orig));
+
+relay_header_unpack(, orig.payload);
+rh.recognized = 0;

[tor-commits] [tor/master] Extract the cryptographic parts of crypt_path_t and or_circuit_t.

[nickm]

commit 5ecad6c95d5e8e9a0abe5c86b5f8f066cc7a8f1c
Author: Nick Mathewson 
Date:   Sat Mar 17 10:59:15 2018 -0400

Extract the cryptographic parts of crypt_path_t and or_circuit_t.

Additionally, this change extracts the functions that created and
freed these elements.

These structures had common "forward stream"
elements, but they were initialized and freed through cpath objects,
and different parts of the code depended on them.  Now all that code
is extacted, and kept in relay_crypto.c
---
 src/or/circuitbuild.c  |  77 ++---
 src/or/circuitlist.c   |  19 ++-
 src/or/or.h|  36 ++--
 src/or/relay_crypto.c  | 136 ++---
 src/or/relay_crypto.h  |   8 +++
 src/test/bench.c   |  13 ++---
 src/test/test_hs_client.c  |  16 +++---
 src/test/test_hs_service.c |   8 +--
 8 files changed, 177 insertions(+), 136 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b3b543348..82c3699c4 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -56,6 +56,7 @@
 #include "onion_fast.h"
 #include "policies.h"
 #include "relay.h"
+#include "relay_crypto.h"
 #include "rendcommon.h"
 #include "rephist.h"
 #include "router.h"
@@ -1336,69 +1337,10 @@ circuit_init_cpath_crypto(crypt_path_t *cpath,
   const char *key_data, size_t key_data_len,
   int reverse, int is_hs_v3)
 {
-  crypto_digest_t *tmp_digest;
-  crypto_cipher_t *tmp_crypto;
-  size_t digest_len = 0;
-  size_t cipher_key_len = 0;
 
   tor_assert(cpath);
-  tor_assert(key_data);
-  tor_assert(!(cpath->f_crypto || cpath->b_crypto ||
- cpath->f_digest || cpath->b_digest));
-
-  /* Basic key size validation */
-  if (is_hs_v3 && BUG(key_data_len != HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN)) {
-return -1;
-  } else if (!is_hs_v3 && BUG(key_data_len != CPATH_KEY_MATERIAL_LEN)) {
-return -1;
-  }
-
-  /* If we are using this cpath for next gen onion services use SHA3-256,
- otherwise use good ol' SHA1 */
-  if (is_hs_v3) {
-digest_len = DIGEST256_LEN;
-cipher_key_len = CIPHER256_KEY_LEN;
-cpath->f_digest = crypto_digest256_new(DIGEST_SHA3_256);
-cpath->b_digest = crypto_digest256_new(DIGEST_SHA3_256);
-  } else {
-digest_len = DIGEST_LEN;
-cipher_key_len = CIPHER_KEY_LEN;
-cpath->f_digest = crypto_digest_new();
-cpath->b_digest = crypto_digest_new();
-  }
-
-  tor_assert(digest_len != 0);
-  tor_assert(cipher_key_len != 0);
-  const int cipher_key_bits = (int) cipher_key_len * 8;
-
-  crypto_digest_add_bytes(cpath->f_digest, key_data, digest_len);
-  crypto_digest_add_bytes(cpath->b_digest, key_data+digest_len, digest_len);
-
-  cpath->f_crypto = crypto_cipher_new_with_bits(key_data+(2*digest_len),
-cipher_key_bits);
-  if (!cpath->f_crypto) {
-log_warn(LD_BUG,"Forward cipher initialization failed.");
-return -1;
-  }
-
-  cpath->b_crypto = crypto_cipher_new_with_bits(
-key_data+(2*digest_len)+cipher_key_len,
-cipher_key_bits);
-  if (!cpath->b_crypto) {
-log_warn(LD_BUG,"Backward cipher initialization failed.");
-return -1;
-  }
-
-  if (reverse) {
-tmp_digest = cpath->f_digest;
-cpath->f_digest = cpath->b_digest;
-cpath->b_digest = tmp_digest;
-tmp_crypto = cpath->f_crypto;
-cpath->f_crypto = cpath->b_crypto;
-cpath->b_crypto = tmp_crypto;
-  }
-
-  return 0;
+  return relay_crypto_init(>crypto, key_data, key_data_len, reverse,
+   is_hs_v3);
 }
 
 /** A "created" cell reply came back to us on circuit circ.
@@ -1521,7 +1463,6 @@ onionskin_answer(or_circuit_t *circ,
  const uint8_t *rend_circ_nonce)
 {
   cell_t cell;
-  crypt_path_t *tmp_cpath;
 
   tor_assert(keys_len == CPATH_KEY_MATERIAL_LEN);
 
@@ -1532,25 +1473,15 @@ onionskin_answer(or_circuit_t *circ,
   }
   cell.circ_id = circ->p_circ_id;
 
-  tmp_cpath = tor_malloc_zero(sizeof(crypt_path_t));
-  tmp_cpath->magic = CRYPT_PATH_MAGIC;
-
   circuit_set_state(TO_CIRCUIT(circ), CIRCUIT_STATE_OPEN);
 
   log_debug(LD_CIRC,"init digest forward 0x%.8x, backward 0x%.8x.",
 (unsigned int)get_uint32(keys),
 (unsigned int)get_uint32(keys+20));
-  if (circuit_init_cpath_crypto(tmp_cpath, keys, keys_len, 0, 0)<0) {
+  if (relay_crypto_init(>crypto, keys, keys_len, 0, 0)<0) {
 log_warn(LD_BUG,"Circuit initialization failed");
-tor_free(tmp_cpath);
 return -1;
   }
-  circ->n_digest = tmp_cpath->f_digest;
-  circ->n_crypto = tmp_cpath->f_crypto;
-  circ->p_digest = tmp_cpath->b_digest;
-  circ->p_crypto = tmp_cpath->b_crypto;
-  tmp_cpath->magic = 0;
-  tor_free(tmp_cpath);
 
   memcpy(circ->rend_circ_nonce, rend_circ_nonce, DIGEST_LEN);
 
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c

[tor-commits] [tor/release-0.3.2] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

[nickm]

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285
Author: Nick Mathewson 
Date:   Mon Mar 19 06:14:57 2018 -0400

PerConnBW{Rate,Burst} docs: do not say consensus param is always set

Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
---
 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/changes/bug25296_032 b/changes/bug25296_032
new file mode 100644
index 0..f60048ca6
--- /dev/null
+++ b/changes/bug25296_032
@@ -0,0 +1,5 @@
+  o Minor bugfixes (documentation):
+- Document that the PerConnBW{Rate,Burst} options will fall back to their
+  corresponding consensus parameters only if those parameters are
+  set. Previously we had claimed that these values would always be
+  set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index aad8440a2..d7884968e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -239,14 +239,14 @@ GENERAL OPTIONS
 (Default: 0)
 
 [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwrate" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwburst" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
 **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'ticket25296_032_squashed' into maint-0.3.2

[nickm]

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39
Merge: df519e5de c2d93e8a7
Author: Nick Mathewson 
Date:   Thu Apr 5 12:08:53 2018 -0400

Merge branch 'ticket25296_032_squashed' into maint-0.3.2

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

[nickm]

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285
Author: Nick Mathewson 
Date:   Mon Mar 19 06:14:57 2018 -0400

PerConnBW{Rate,Burst} docs: do not say consensus param is always set

Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
---
 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/changes/bug25296_032 b/changes/bug25296_032
new file mode 100644
index 0..f60048ca6
--- /dev/null
+++ b/changes/bug25296_032
@@ -0,0 +1,5 @@
+  o Minor bugfixes (documentation):
+- Document that the PerConnBW{Rate,Burst} options will fall back to their
+  corresponding consensus parameters only if those parameters are
+  set. Previously we had claimed that these values would always be
+  set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index aad8440a2..d7884968e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -239,14 +239,14 @@ GENERAL OPTIONS
 (Default: 0)
 
 [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwrate" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwburst" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
 **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit 98a04984901585ed1a31032cc58d6dc3bd5dd415
Merge: ad0bc6e54 12fc4206f
Author: Nick Mathewson 
Date:   Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

[nickm]

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285
Author: Nick Mathewson 
Date:   Mon Mar 19 06:14:57 2018 -0400

PerConnBW{Rate,Burst} docs: do not say consensus param is always set

Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
---
 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/changes/bug25296_032 b/changes/bug25296_032
new file mode 100644
index 0..f60048ca6
--- /dev/null
+++ b/changes/bug25296_032
@@ -0,0 +1,5 @@
+  o Minor bugfixes (documentation):
+- Document that the PerConnBW{Rate,Burst} options will fall back to their
+  corresponding consensus parameters only if those parameters are
+  set. Previously we had claimed that these values would always be
+  set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index aad8440a2..d7884968e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -239,14 +239,14 @@ GENERAL OPTIONS
 (Default: 0)
 
 [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwrate" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwburst" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
 **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'ticket25296_032_squashed' into maint-0.3.2

[nickm]

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39
Merge: df519e5de c2d93e8a7
Author: Nick Mathewson 
Date:   Thu Apr 5 12:08:53 2018 -0400

Merge branch 'ticket25296_032_squashed' into maint-0.3.2

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 12fc4206f28576d872033b8a99756252e5354662
Merge: 2dee38fba 124e06e85
Author: Nick Mathewson 
Date:   Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --cc doc/tor.1.txt
index 415cd6f3a,d7884968e..af2ac090c
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -238,18 -236,17 +238,18 @@@ GENERAL OPTION
  [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
  If not 0, limit the maximum token bucket size (also known as the burst) 
for
  \_relayed traffic_ to the given number of bytes in each direction.
 -(Default: 0)
 +They do not include directory fetches by the relay (from authority
 +or other relays), because that is considered "client" activity. (Default: 
0)
  
  [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
- If set, do separate rate limiting for each connection from a non-relay.
- You should never need to change this value, since a network-wide value is
- published in the consensus and your relay will use that value. (Default: 
0)
+ If this option is set manually, or via the "perconnbwrate" consensus
+ field, Tor will use it for separate rate limiting for each connection
+ from a non-relay. (Default: 0)
  
  [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
- If set, do separate rate limiting for each connection from a non-relay.
- You should never need to change this value, since a network-wide value is
- published in the consensus and your relay will use that value. (Default: 
0)
+ If this option is set manually, or via the "perconnbwburst" consensus
+ field, Tor will use it for separate rate limiting for each connection
+ from a non-relay. (Default: 0)
  
  [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
  **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm]

commit bc250fcabd4cb5695a0c3725e24eb6a30e54c238
Merge: 955a7f52d 124e06e85
Author: Nick Mathewson 
Date:   Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'ticket25296_032_squashed' into maint-0.3.2

[nickm]

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39
Merge: df519e5de c2d93e8a7
Author: Nick Mathewson 
Date:   Thu Apr 5 12:08:53 2018 -0400

Merge branch 'ticket25296_032_squashed' into maint-0.3.2

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 12fc4206f28576d872033b8a99756252e5354662
Merge: 2dee38fba 124e06e85
Author: Nick Mathewson 
Date:   Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --cc doc/tor.1.txt
index 415cd6f3a,d7884968e..af2ac090c
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -238,18 -236,17 +238,18 @@@ GENERAL OPTION
  [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
  If not 0, limit the maximum token bucket size (also known as the burst) 
for
  \_relayed traffic_ to the given number of bytes in each direction.
 -(Default: 0)
 +They do not include directory fetches by the relay (from authority
 +or other relays), because that is considered "client" activity. (Default: 
0)
  
  [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
- If set, do separate rate limiting for each connection from a non-relay.
- You should never need to change this value, since a network-wide value is
- published in the consensus and your relay will use that value. (Default: 
0)
+ If this option is set manually, or via the "perconnbwrate" consensus
+ field, Tor will use it for separate rate limiting for each connection
+ from a non-relay. (Default: 0)
  
  [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
- If set, do separate rate limiting for each connection from a non-relay.
- You should never need to change this value, since a network-wide value is
- published in the consensus and your relay will use that value. (Default: 
0)
+ If this option is set manually, or via the "perconnbwburst" consensus
+ field, Tor will use it for separate rate limiting for each connection
+ from a non-relay. (Default: 0)
  
  [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
  **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm]

commit 2933f73b31a51ed4ffdb5c0f69c7b58d11c237b6
Merge: 6bd8f648b 12fc4206f
Author: Nick Mathewson 
Date:   Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.3'

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 12fc4206f28576d872033b8a99756252e5354662
Merge: 2dee38fba 124e06e85
Author: Nick Mathewson 
Date:   Thu Apr 5 12:09:00 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --cc doc/tor.1.txt
index 415cd6f3a,d7884968e..af2ac090c
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -238,18 -236,17 +238,18 @@@ GENERAL OPTION
  [[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
  If not 0, limit the maximum token bucket size (also known as the burst) 
for
  \_relayed traffic_ to the given number of bytes in each direction.
 -(Default: 0)
 +They do not include directory fetches by the relay (from authority
 +or other relays), because that is considered "client" activity. (Default: 
0)
  
  [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
- If set, do separate rate limiting for each connection from a non-relay.
- You should never need to change this value, since a network-wide value is
- published in the consensus and your relay will use that value. (Default: 
0)
+ If this option is set manually, or via the "perconnbwrate" consensus
+ field, Tor will use it for separate rate limiting for each connection
+ from a non-relay. (Default: 0)
  
  [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
- If set, do separate rate limiting for each connection from a non-relay.
- You should never need to change this value, since a network-wide value is
- published in the consensus and your relay will use that value. (Default: 
0)
+ If this option is set manually, or via the "perconnbwburst" consensus
+ field, Tor will use it for separate rate limiting for each connection
+ from a non-relay. (Default: 0)
  
  [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
  **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'ticket25296_032_squashed' into maint-0.3.2

[nickm]

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39
Merge: df519e5de c2d93e8a7
Author: Nick Mathewson 
Date:   Thu Apr 5 12:08:53 2018 -0400

Merge branch 'ticket25296_032_squashed' into maint-0.3.2

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

[nickm]

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285
Author: Nick Mathewson 
Date:   Mon Mar 19 06:14:57 2018 -0400

PerConnBW{Rate,Burst} docs: do not say consensus param is always set

Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
---
 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/changes/bug25296_032 b/changes/bug25296_032
new file mode 100644
index 0..f60048ca6
--- /dev/null
+++ b/changes/bug25296_032
@@ -0,0 +1,5 @@
+  o Minor bugfixes (documentation):
+- Document that the PerConnBW{Rate,Burst} options will fall back to their
+  corresponding consensus parameters only if those parameters are
+  set. Previously we had claimed that these values would always be
+  set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index aad8440a2..d7884968e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -239,14 +239,14 @@ GENERAL OPTIONS
 (Default: 0)
 
 [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwrate" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwburst" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
 **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] PerConnBW{Rate, Burst} docs: do not say consensus param is always set

[nickm]

commit c2d93e8a7d1d2d4e7f3516681e2ee62ce4f87285
Author: Nick Mathewson 
Date:   Mon Mar 19 06:14:57 2018 -0400

PerConnBW{Rate,Burst} docs: do not say consensus param is always set

Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
---
 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/changes/bug25296_032 b/changes/bug25296_032
new file mode 100644
index 0..f60048ca6
--- /dev/null
+++ b/changes/bug25296_032
@@ -0,0 +1,5 @@
+  o Minor bugfixes (documentation):
+- Document that the PerConnBW{Rate,Burst} options will fall back to their
+  corresponding consensus parameters only if those parameters are
+  set. Previously we had claimed that these values would always be
+  set in the consensus. Fixes bug 25296; bugfix on 0.2.2.7-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index aad8440a2..d7884968e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -239,14 +239,14 @@ GENERAL OPTIONS
 (Default: 0)
 
 [[PerConnBWRate]] **PerConnBWRate** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwrate" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[PerConnBWBurst]] **PerConnBWBurst** __N__ 
**bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
-If set, do separate rate limiting for each connection from a non-relay.
-You should never need to change this value, since a network-wide value is
-published in the consensus and your relay will use that value. (Default: 0)
+If this option is set manually, or via the "perconnbwburst" consensus
+field, Tor will use it for separate rate limiting for each connection
+from a non-relay. (Default: 0)
 
 [[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ 
socks4|socks5 __IP__:__PORT__::
 **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]::



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'ticket25296_032_squashed' into maint-0.3.2

[nickm]

commit 124e06e85cf72152e9bdbd91e3cd6da9a5b1fd39
Merge: df519e5de c2d93e8a7
Author: Nick Mathewson 
Date:   Thu Apr 5 12:08:53 2018 -0400

Merge branch 'ticket25296_032_squashed' into maint-0.3.2

 changes/bug25296_032 |  5 +
 doc/tor.1.txt| 12 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] man: Move RephistTrackTime to the server section

[nickm]

commit 6bd8f648b71b5f1090e41a51490fcbda6d2351ce
Author: David Goulet 
Date:   Thu Apr 5 09:42:45 2018 -0400

man: Move RephistTrackTime to the server section

Every node in the network uses that value, it is a general server options, 
not
a dirauth specific one.

Fixes #25720

Signed-off-by: David Goulet 
---
 doc/tor.1.txt | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 33d5c9c64..18d68b4cf 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2362,6 +2362,11 @@ is non-zero):
 KeywDirectory. If the option is set to 1, make the KeyDirectory readable
 by the default GID. (Default: 0)
 
+[[RephistTrackTime]] **RephistTrackTime** __N__ 
**seconds**|**minutes**|**hours**|**days**|**weeks**::
+Tells an authority, or other node tracking node reliability and history,
+that fine-grained information about nodes can be discarded when it hasn't
+changed for a given amount of time.  (Default: 24 hours)
+
 
 DIRECTORY SERVER OPTIONS
 
@@ -2599,11 +2604,6 @@ on the public Tor network.
 different identity.  This feature is used to migrate directory authority
 keys in the event of a compromise.  (Default: 0)
 
-[[RephistTrackTime]] **RephistTrackTime** __N__ 
**seconds**|**minutes**|**hours**|**days**|**weeks**::
-Tells an authority, or other node tracking node reliability and history,
-that fine-grained information about nodes can be discarded when it hasn't
-changed for a given amount of time.  (Default: 24 hours)
-
 [[AuthDirHasIPv6Connectivity]] **AuthDirHasIPv6Connectivity** **0**|**1**::
 Authoritative directories only. When set to 0, OR ports with an
 IPv6 address are not included in the authority's votes. When set to 1,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Switch to use should_record_bridge_info()

[dgoulet]

commit f5f9c2554601e51157d8b563f124cea3fd3d98d4
Author: Neel Chauhan 
Date:   Thu Apr 5 08:35:21 2018 -0400

Switch to use should_record_bridge_info()

Both in geoip_note_client_seen() and options_need_geoip_info(), switch from
accessing the options directly to using the should_record_bridge_info() 
helper
function.

Fixes #25290

Signed-off-by: David Goulet 
---
 changes/ticket25290 | 5 +
 src/or/config.c | 3 +--
 src/or/geoip.c  | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/changes/ticket25290 b/changes/ticket25290
new file mode 100644
index 0..5e44f5e05
--- /dev/null
+++ b/changes/ticket25290
@@ -0,0 +1,5 @@
+  o Code simplification and refactoring:
+- We switch to should_record_bridge_info() in geoip_note_client_seen() and
+  options_need_geoip_info() instead of accessing the configuration values
+  directly. Fixes bug 25290; bugfix on 0.2.1.6-alpha. Patch by Neel
+  Chauhan.
diff --git a/src/or/config.c b/src/or/config.c
index 212c6c6b9..8658a1326 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1682,8 +1682,7 @@ options_act_reversible(const or_options_t *old_options, 
char **msg)
 int
 options_need_geoip_info(const or_options_t *options, const char **reason_out)
 {
-  int bridge_usage =
-options->BridgeRelay && options->BridgeRecordUsageByCountry;
+  int bridge_usage = should_record_bridge_info(options);
   int routerset_usage =
 routerset_needs_geoip(options->EntryNodes) ||
 routerset_needs_geoip(options->ExitNodes) ||
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 572bba577..2c917c564 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -628,8 +628,7 @@ geoip_note_client_seen(geoip_client_action_t action,
 /* Only remember statistics if the DoS mitigation subsystem is enabled. If
  * not, only if as entry guard or as bridge. */
 if (!dos_enabled()) {
-  if (!options->EntryStatistics &&
-  (!(options->BridgeRelay && options->BridgeRecordUsageByCountry))) {
+  if (!options->EntryStatistics && !should_record_bridge_info(options)) {
 return;
   }
 }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 25126: Make about:tor layout responsive

[gk]

commit fb8c46b3fb3e89b0fd182f87ba3139f5b31ad186
Author: Igor Oliveira 
Date:   Tue Apr 3 20:15:38 2018 -0300

Bug 25126: Make about:tor layout responsive

Use flexbox and media queries to make the layout responsive.

For small and medium break points, remove the tor status image
since there isn't enough space.
---
 src/chrome/content/aboutTor/aboutTor.xhtml | 149 +++--
 src/chrome/skin/aboutTor.css   |  87 +++--
 2 files changed, 132 insertions(+), 104 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml 
b/src/chrome/content/aboutTor/aboutTor.xhtml
index 7ae4b8b..0d8f680 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -1,6 +1,6 @@
 
 
@@ -31,87 +31,88 @@ window.addEventListener("pageshow", function() {
 
 
 
-
-  
-  
-  
-
-
-
-
-
-  
-
-  
-  
-
-
-
-  
-
-
   
-
-
-
-
-
-
-
-
+  
+  
+  
+  
   
-
+  
+
+
+  
+  
+
+
+
+
+
+  
+
+  
+  
+
+
+
+  
+
+
+  
+
+
+
+  
+
+  
+
 
- 
-  
-  
-
-  
+ 
+  
+  
+
+  
+
+
+  
+  
+  
 
-
-  
-  
-  
-
 
-
+
 
-
-  
-
-  
-  
-  
-
-  
-
-  
-
-
-  
-_user_manual.label; 
-  
-
-  
-
+
+
+  
+  
+  
+
+  
+
+  
+
+
+  
+_user_manual.label; 
+  
+
+  
+
+
+  
+  
+  
+
+
+
+  
+
+ 
 
-
-  
-  
-  
-
-
-
-  
+
+  
+
 
   
- 
-
-
-  
-
-
-
 
 
diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index c0d2ebc..7ba7e7c 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, The Tor Project, Inc.
+ * Copyright (c) 2018, The Tor Project, Inc.
  * See LICENSE for licensing information.
  *
  * vim: set sw=2 sts=2 ts=8 et syntax=css:
@@ -11,8 +11,6 @@
 }
 
 body {
-  min-width: 920px;
-  max-width: 920px;
   width: 100%;
   height: 100%;
   margin: 0px auto;
@@ -43,8 +41,14 @@ body:not([initialized]) {
   display: none;
 }
 
+.torcontent-container {
+  margin: 40px 20px;
+  display: flex;
+  flex-direction: column;
+}
+
 #torstatus-version {
-  position: fixed;
+  position: absolute;
   top: 6px;
   right: 6px;
   height: 30px;
@@ -59,8 +63,9 @@ body[toron] #torstatus-image {
 }
 
 #torstatus-image {
+  display: none;
   position: absolute;
-  left: 70px;
+  left: 85px;
   height: 128px;
   width: 128px;
   background-image: url('chrome://torbutton/content/aboutTor/tor-off.png');
@@ -116,17 +121,19 @@ a:hover {
 
 #torstatus {
   position: relative; /* needed for torstatus-image positioning */
-  max-width: 620px;
+  display: flex;
+  justify-content: center;
   min-height: 148px;
-  padding: 15px 128px 0px 128px;
-  margin: 20px auto 0px auto;
 }
 
 .top {
-  text-align: center;
   white-space: nowrap;
 }
 
+.torstatus-container {
+  text-align: center;
+}
+
 body[toron][torNeedsUpdate] .hideIfTBBNeedsUpdate,
 body:not([torNeedsUpdate]) .hideIfTorIsUpToDate {
   display: none;
@@ -145,19 +152,22 @@ body:not([showmanual]) .showForManual {
   display: none;
 }
 
+div.hideIfTorIsUpToDate {
+  display: flex;
+  flex-direction: column;
+}
+
 div.hideIfTorIsUpToDate,
 body .top div.hideIfTorIsUpToDate h1 {
   color: black;
-}
-
-body .top div.hideIfTorIsUpToDate h1.hideIfTorOff {
-  margin-left: 30px;
+  text-align: center;
 }
 
 /* Use inline-block for text-oriented elements whose widths need to measured. 
*/
 .torstatus-container *,
 .top div.hideIfTorIsUpToDate h3 {
   display: inline-block;
+  text-align: center;
 }
 
 .top div.hideIfTorOff h1 {
@@ -183,28 +193,21 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff {
 }
 
 #middle {
-  display: table;
-  width: 904px;   /* 920px - (2 * 8px extra side margin) */
-  margin: 40px auto 10px auto;
-  border-spacing: 100px 0px;
-  border-collapse: separate;
-  text-align: center;
+  display: flex;
+  flex-flow: row wrap;
   font-size: 1.6em;
+  justify-content: space-evenly;
+  margin-top: 40px;
 }
 
-.bubbleRow {
-  display: table-row;
-}
-
-.bubbleRow div.bubble {
-  display: table-cell;
-  width: 50%;
-  height: 100%;
+.bubble {
+  width: 242px;
   padding: 20px 30px;
   color: #3B503C;
   background-color: #FF;
   border: none;
   border-radius: 16px;
+  margin-bottom: 40px;
   text-align: start;
   vertical-align: 

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 2dee38fba0193c952500b9d0227ebcff6d5432d6
Merge: 78bf56416 df519e5de
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit ad0bc6e54c906e3c9e44a25d7675954b88775535
Merge: 876b4b168 2dee38fba
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit df519e5de87d027ba51742b2b50710c69b9db2be
Merge: 9b10eb2d7 e813116d3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit df519e5de87d027ba51742b2b50710c69b9db2be
Merge: 9b10eb2d7 e813116d3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Switch Travis to stable rust

[nickm]

commit e813116d3d630d81feb97f39dd65fdf245eecebc
Author: Taylor Yu 
Date:   Wed Apr 4 17:07:39 2018 -0500

Switch Travis to stable rust
---
 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6450d270..0c0188410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || 
brew upgrade xz; }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt  || 
brew upgrade libscrypt;  }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd   || 
brew upgrade zstd;   }; fi
-  ## Install the nightly channels of rustc and cargo and setup our toolchain 
environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
nightly; fi
+  ## Install the stable channels of rustc and cargo and setup our toolchain 
environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
stable; fi
   - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
   ## Get some info about rustc and cargo
   - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
diff --git a/changes/ticket25714 b/changes/ticket25714
new file mode 100644
index 0..63823fc6c
--- /dev/null
+++ b/changes/ticket25714
@@ -0,0 +1,4 @@
+  o Minor feature (continuous integration):
+- Update the Travis CI configuration to use the stable Rust
+  channel, now that we have decided to require that.  Closes
+  ticket 25714.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Switch Travis to stable rust

[nickm]

commit e813116d3d630d81feb97f39dd65fdf245eecebc
Author: Taylor Yu 
Date:   Wed Apr 4 17:07:39 2018 -0500

Switch Travis to stable rust
---
 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6450d270..0c0188410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || 
brew upgrade xz; }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt  || 
brew upgrade libscrypt;  }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd   || 
brew upgrade zstd;   }; fi
-  ## Install the nightly channels of rustc and cargo and setup our toolchain 
environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
nightly; fi
+  ## Install the stable channels of rustc and cargo and setup our toolchain 
environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
stable; fi
   - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
   ## Get some info about rustc and cargo
   - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
diff --git a/changes/ticket25714 b/changes/ticket25714
new file mode 100644
index 0..63823fc6c
--- /dev/null
+++ b/changes/ticket25714
@@ -0,0 +1,4 @@
+  o Minor feature (continuous integration):
+- Update the Travis CI configuration to use the stable Rust
+  channel, now that we have decided to require that.  Closes
+  ticket 25714.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 2dee38fba0193c952500b9d0227ebcff6d5432d6
Merge: 78bf56416 df519e5de
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 347b38d6d9dc73f0d14ff60ee8729550cea9a952
Merge: 04007557f e813116d3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm]

commit 98157c72cd9ddcfd92cd5cd2749d19d1677efd14
Merge: ad8347418 2dee38fba
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.3'

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Switch Travis to stable rust

[nickm]

commit e813116d3d630d81feb97f39dd65fdf245eecebc
Author: Taylor Yu 
Date:   Wed Apr 4 17:07:39 2018 -0500

Switch Travis to stable rust
---
 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6450d270..0c0188410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || 
brew upgrade xz; }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt  || 
brew upgrade libscrypt;  }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd   || 
brew upgrade zstd;   }; fi
-  ## Install the nightly channels of rustc and cargo and setup our toolchain 
environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
nightly; fi
+  ## Install the stable channels of rustc and cargo and setup our toolchain 
environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
stable; fi
   - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
   ## Get some info about rustc and cargo
   - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
diff --git a/changes/ticket25714 b/changes/ticket25714
new file mode 100644
index 0..63823fc6c
--- /dev/null
+++ b/changes/ticket25714
@@ -0,0 +1,4 @@
+  o Minor feature (continuous integration):
+- Update the Travis CI configuration to use the stable Rust
+  channel, now that we have decided to require that.  Closes
+  ticket 25714.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit df519e5de87d027ba51742b2b50710c69b9db2be
Merge: 9b10eb2d7 e813116d3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit df519e5de87d027ba51742b2b50710c69b9db2be
Merge: 9b10eb2d7 e813116d3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Switch Travis to stable rust

[nickm]

commit e813116d3d630d81feb97f39dd65fdf245eecebc
Author: Taylor Yu 
Date:   Wed Apr 4 17:07:39 2018 -0500

Switch Travis to stable rust
---
 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6450d270..0c0188410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || 
brew upgrade xz; }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt  || 
brew upgrade libscrypt;  }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd   || 
brew upgrade zstd;   }; fi
-  ## Install the nightly channels of rustc and cargo and setup our toolchain 
environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
nightly; fi
+  ## Install the stable channels of rustc and cargo and setup our toolchain 
environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
stable; fi
   - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
   ## Get some info about rustc and cargo
   - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
diff --git a/changes/ticket25714 b/changes/ticket25714
new file mode 100644
index 0..63823fc6c
--- /dev/null
+++ b/changes/ticket25714
@@ -0,0 +1,4 @@
+  o Minor feature (continuous integration):
+- Update the Travis CI configuration to use the stable Rust
+  channel, now that we have decided to require that.  Closes
+  ticket 25714.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Switch Travis to stable rust

[nickm]

commit e813116d3d630d81feb97f39dd65fdf245eecebc
Author: Taylor Yu 
Date:   Wed Apr 4 17:07:39 2018 -0500

Switch Travis to stable rust
---
 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6450d270..0c0188410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || 
brew upgrade xz; }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt  || 
brew upgrade libscrypt;  }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd   || 
brew upgrade zstd;   }; fi
-  ## Install the nightly channels of rustc and cargo and setup our toolchain 
environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
nightly; fi
+  ## Install the stable channels of rustc and cargo and setup our toolchain 
environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
stable; fi
   - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
   ## Get some info about rustc and cargo
   - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
diff --git a/changes/ticket25714 b/changes/ticket25714
new file mode 100644
index 0..63823fc6c
--- /dev/null
+++ b/changes/ticket25714
@@ -0,0 +1,4 @@
+  o Minor feature (continuous integration):
+- Update the Travis CI configuration to use the stable Rust
+  channel, now that we have decided to require that.  Closes
+  ticket 25714.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 2dee38fba0193c952500b9d0227ebcff6d5432d6
Merge: 78bf56416 df519e5de
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit df519e5de87d027ba51742b2b50710c69b9db2be
Merge: 9b10eb2d7 e813116d3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Switch Travis to stable rust

[nickm]

commit e813116d3d630d81feb97f39dd65fdf245eecebc
Author: Taylor Yu 
Date:   Wed Apr 4 17:07:39 2018 -0500

Switch Travis to stable rust
---
 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6450d270..0c0188410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || 
brew upgrade xz; }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt  || 
brew upgrade libscrypt;  }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd   || 
brew upgrade zstd;   }; fi
-  ## Install the nightly channels of rustc and cargo and setup our toolchain 
environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
nightly; fi
+  ## Install the stable channels of rustc and cargo and setup our toolchain 
environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
stable; fi
   - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
   ## Get some info about rustc and cargo
   - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
diff --git a/changes/ticket25714 b/changes/ticket25714
new file mode 100644
index 0..63823fc6c
--- /dev/null
+++ b/changes/ticket25714
@@ -0,0 +1,4 @@
+  o Minor feature (continuous integration):
+- Update the Travis CI configuration to use the stable Rust
+  channel, now that we have decided to require that.  Closes
+  ticket 25714.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm]

commit 955a7f52d36e99a96df5e54a2a88dcc2b9931f62
Merge: 70bd4aae6 df519e5de
Author: Nick Mathewson 
Date:   Thu Apr 5 08:36:13 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Switch Travis to stable rust

[nickm]

commit e813116d3d630d81feb97f39dd65fdf245eecebc
Author: Taylor Yu 
Date:   Wed Apr 4 17:07:39 2018 -0500

Switch Travis to stable rust
---
 .travis.yml | 4 ++--
 changes/ticket25714 | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6450d270..0c0188410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,8 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || 
brew upgrade xz; }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt  || 
brew upgrade libscrypt;  }; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd   || 
brew upgrade zstd;   }; fi
-  ## Install the nightly channels of rustc and cargo and setup our toolchain 
environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
nightly; fi
+  ## Install the stable channels of rustc and cargo and setup our toolchain 
environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
stable; fi
   - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
   ## Get some info about rustc and cargo
   - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
diff --git a/changes/ticket25714 b/changes/ticket25714
new file mode 100644
index 0..63823fc6c
--- /dev/null
+++ b/changes/ticket25714
@@ -0,0 +1,4 @@
+  o Minor feature (continuous integration):
+- Update the Travis CI configuration to use the stable Rust
+  channel, now that we have decided to require that.  Closes
+  ticket 25714.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 78bf56416868ed6de53af63d49c6d8555150f856
Merge: ac3e389db 9b10eb2d7
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm]

commit 04007557fb5473ad4571afe78207c114ecfaf1f0
Merge: cbea95ae6 834eef245
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm]

commit 8a363a7c8467093061d02fe611d18a971f0c1078
Merge: c26fa0537 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit 876b4b168ac9552de392d9c8275754f560d5bb32
Merge: 8a8b4ae69 78bf56416
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 9b10eb2d7abe703f544aca559d385fc7f269
Merge: 0b795ce6d 834eef245
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 9b10eb2d7abe703f544aca559d385fc7f269
Merge: 0b795ce6d 834eef245
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm]

commit 70bd4aae670bf48af0b83a3b14b2d841244b7e92
Merge: 6170f87e0 9b10eb2d7
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 78bf56416868ed6de53af63d49c6d8555150f856
Merge: ac3e389db 9b10eb2d7
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm]

commit 78bf56416868ed6de53af63d49c6d8555150f856
Merge: ac3e389db 9b10eb2d7
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 9b10eb2d7abe703f544aca559d385fc7f269
Merge: 0b795ce6d 834eef245
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm]

commit ad8347418f9cbf629de4213eb0a3681033df7b1b
Merge: 43f315558 78bf56416
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:35 2018 -0400

Merge branch 'maint-0.3.3'

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 9b10eb2d7abe703f544aca559d385fc7f269
Merge: 0b795ce6d 834eef245
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

[nickm]

commit 279fa65d34bbb41d1428eb62f6172b218598644e
Merge: 1d281eb93 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm]

commit 9b10eb2d7abe703f544aca559d385fc7f269
Merge: 0b795ce6d 834eef245
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm]

commit b68e636b3368feb48444fd2f652ca279ddb73946
Merge: 4bb7d9fd1 1fa396b0a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:33 2018 -0400

Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm]

commit 834eef2452a667c5557e5a09bb879cc2fc98a661
Merge: 5acfc3087 b68e636b3
Author: Nick Mathewson 
Date:   Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/geoip-2018-04-03 | 4 +
 src/config/geoip | 39253 ++---
 src/config/geoip6|  5391 +++
 3 files changed, 31480 insertions(+), 13168 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'bug25679_033_squashed' into maint-0.3.3

[nickm]

commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69
Merge: ec8ee5412 e3ad4957a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:20:15 2018 -0400

Merge branch 'bug25679_033_squashed' into maint-0.3.3

 changes/bug25679 |  4 
 configure.ac | 12 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix the default for TOR_RUST_DEPENDENCIES

[nickm]

commit e3ad4957a8d06716d3e5dad9cda09ce236b941d1
Author: Nick Mathewson 
Date:   Fri Mar 30 08:53:58 2018 -0400

Fix the default for TOR_RUST_DEPENDENCIES

By default, we want to look at the crates directory of the
submodule, not the toplevel of the submodule.  Fixes bug 25679;
bugfix on 0.3.3.1-alpha.
---
 changes/bug25679 |  4 
 configure.ac | 12 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/changes/bug25679 b/changes/bug25679
new file mode 100644
index 0..9247a2915
--- /dev/null
+++ b/changes/bug25679
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation, rust):
+- Build correctly when the rust dependencies submodule is loaded,
+  but the TOR_RUST_DEPENDENCIES environment variable is not set.
+  Fixes bug 25679; bugfix on 0.3.3.1-alpha.
diff --git a/configure.ac b/configure.ac
index 2045e0d5f..143044956 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,23 +440,23 @@ if test "x$enable_rust" = "xyes"; then
 AC_MSG_CHECKING([rust crate dependencies])
 AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate 
mirror])
 if test "x$TOR_RUST_DEPENDENCIES" = "x"; then
-  TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/"
-  NEED_MOD=1
+  TOR_RUST_DEPENDENCIES="${srcdir}/src/ext/rust/crates"
 fi
+dnl Check whether the path exists before we try to cd into it.
 if test ! -d "$TOR_RUST_DEPENDENCIES"; then
   AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not 
exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable 
or allow cargo to fetch crates using --enable-cargo-online-mode.])
   ERRORED=1
 fi
+dnl Make the path absolute, since we'll be using it from within a
+dnl subdirectory.
+TOR_RUST_DEPENDENCIES=$(cd "$TOR_RUST_DEPENDENCIES" ; pwd)
+
 for dep in $rust_crates; do
   if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then
 AC_MSG_ERROR([Failure to find rust dependency 
$TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the 
TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using 
--enable-cargo-online-mode.])
 ERRORED=1
   fi
 done
-if test "x$NEED_MOD" = "x1"; then
-  dnl When looking for dependencies from cargo, pick right directory
-  TOR_RUST_DEPENDENCIES="../../src/ext/rust"
-fi
 if test "x$ERRORED" = "x"; then
   AC_MSG_RESULT([yes])
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] man: Add a comment to anchor only option

[nickm]

commit ff38c0589ceab60cda9c27b117d1dcfef55b3539
Author: David Goulet 
Date:   Wed Apr 4 11:38:42 2018 -0400

man: Add a comment to anchor only option

Some anchor don't appear in the final man page so document those so we
understand why we do that in the future.

Part of #25582

Signed-off-by: David Goulet 
---
 doc/tor.1.txt | 4 
 1 file changed, 4 insertions(+)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 2c01a3ec9..415cd6f3a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1203,6 +1203,7 @@ The following options are useful only for clients (that 
is, if
 on different SocksPorts, TransPorts, etc are always isolated from one
 another. This option overrides that behavior.)
 
+// Anchor only for formatting, not visible in the man page.
 [[OtherSocksPortFlags]]::
 Other recognized __flags__ for a SocksPort are:
 **NoIPv4Traffic**;;
@@ -1267,6 +1268,7 @@ The following options are useful only for clients (that 
is, if
 authentication" when IsolateSOCKSAuth is disabled, or when this
 option is set.
 
+// Anchor only for formatting, not visible in the man page.
 [[SocksPortFlagsMisc]]::
 Flags are processed left to right. If flags conflict, the last flag on the
 line is used, and all earlier flags are ignored. No error is issued for
@@ -1904,6 +1906,7 @@ is non-zero):
reject *:6881-6999
accept *:*
 
+// Anchor only for formatting, not visible in the man page.
 [[ExitPolicyDefault]]::
 Since the default exit policy uses accept/reject *, it applies to both
 IPv4 and IPv6 addresses.
@@ -2079,6 +2082,7 @@ is non-zero):
 If the address is absent, or resolves to both an IPv4 and an IPv6
 address, only listen to the IPv6 address.
 
+// Anchor only for formatting, not visible in the man page.
 [[ORPortFlagsExclusive]]::
 For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and
 IPv4Only and IPv6Only are mutually exclusive.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

[nickm]

commit ac3e389dbd7224a23dfa12da7a15b748feb88435
Merge: 8f798b686 ff38c0589
Author: Nick Mathewson 
Date:   Thu Apr 5 08:21:38 2018 -0400

Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

 changes/bug25582 | 3 +++
 doc/tor.1.txt| 6 +-
 2 files changed, 8 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] man: Add a comment to anchor only option

[nickm]

commit ff38c0589ceab60cda9c27b117d1dcfef55b3539
Author: David Goulet 
Date:   Wed Apr 4 11:38:42 2018 -0400

man: Add a comment to anchor only option

Some anchor don't appear in the final man page so document those so we
understand why we do that in the future.

Part of #25582

Signed-off-by: David Goulet 
---
 doc/tor.1.txt | 4 
 1 file changed, 4 insertions(+)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 2c01a3ec9..415cd6f3a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1203,6 +1203,7 @@ The following options are useful only for clients (that 
is, if
 on different SocksPorts, TransPorts, etc are always isolated from one
 another. This option overrides that behavior.)
 
+// Anchor only for formatting, not visible in the man page.
 [[OtherSocksPortFlags]]::
 Other recognized __flags__ for a SocksPort are:
 **NoIPv4Traffic**;;
@@ -1267,6 +1268,7 @@ The following options are useful only for clients (that 
is, if
 authentication" when IsolateSOCKSAuth is disabled, or when this
 option is set.
 
+// Anchor only for formatting, not visible in the man page.
 [[SocksPortFlagsMisc]]::
 Flags are processed left to right. If flags conflict, the last flag on the
 line is used, and all earlier flags are ignored. No error is issued for
@@ -1904,6 +1906,7 @@ is non-zero):
reject *:6881-6999
accept *:*
 
+// Anchor only for formatting, not visible in the man page.
 [[ExitPolicyDefault]]::
 Since the default exit policy uses accept/reject *, it applies to both
 IPv4 and IPv6 addresses.
@@ -2079,6 +2082,7 @@ is non-zero):
 If the address is absent, or resolves to both an IPv4 and an IPv6
 address, only listen to the IPv6 address.
 
+// Anchor only for formatting, not visible in the man page.
 [[ORPortFlagsExclusive]]::
 For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and
 IPv4Only and IPv6Only are mutually exclusive.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

[nickm]

commit ac3e389dbd7224a23dfa12da7a15b748feb88435
Merge: 8f798b686 ff38c0589
Author: Nick Mathewson 
Date:   Thu Apr 5 08:21:38 2018 -0400

Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

 changes/bug25582 | 3 +++
 doc/tor.1.txt| 6 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Remove erroneous section heading "ExitPolicyDefault"

[nickm]

commit 6d7c4c6ec2f76512c1142c1cb4453967d3bc1661
Author: Nick Mathewson 
Date:   Thu Mar 29 15:06:07 2018 -0400

Remove erroneous section heading "ExitPolicyDefault"

The anchor here was originally introduced to make sure that the
manpage would format correctly, but we had mistaken it for a section
anchor, and introduced a bogus section heading in 3563a2c8194ebe94.

Fixes bug 25582; bugfix on 0.3.3.1-alpha.
---
 changes/bug25582 | 3 +++
 doc/tor.1.txt| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug25582 b/changes/bug25582
new file mode 100644
index 0..609b94aac
--- /dev/null
+++ b/changes/bug25582
@@ -0,0 +1,3 @@
+  o Minor bugfixes (documentation):
+- Revert a misformatting issue in the ExitPolicy
+  documentation. Fixes bug 25582; bugfix on 0.3.3.1-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 80769412f..2c01a3ec9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1904,7 +1904,7 @@ is non-zero):
reject *:6881-6999
accept *:*
 
-[[ExitPolicyDefault]] **ExitPolicyDefault**::
+[[ExitPolicyDefault]]::
 Since the default exit policy uses accept/reject *, it applies to both
 IPv4 and IPv6 addresses.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] man: Add a comment to anchor only option

[nickm]

commit ff38c0589ceab60cda9c27b117d1dcfef55b3539
Author: David Goulet 
Date:   Wed Apr 4 11:38:42 2018 -0400

man: Add a comment to anchor only option

Some anchor don't appear in the final man page so document those so we
understand why we do that in the future.

Part of #25582

Signed-off-by: David Goulet 
---
 doc/tor.1.txt | 4 
 1 file changed, 4 insertions(+)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 2c01a3ec9..415cd6f3a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1203,6 +1203,7 @@ The following options are useful only for clients (that 
is, if
 on different SocksPorts, TransPorts, etc are always isolated from one
 another. This option overrides that behavior.)
 
+// Anchor only for formatting, not visible in the man page.
 [[OtherSocksPortFlags]]::
 Other recognized __flags__ for a SocksPort are:
 **NoIPv4Traffic**;;
@@ -1267,6 +1268,7 @@ The following options are useful only for clients (that 
is, if
 authentication" when IsolateSOCKSAuth is disabled, or when this
 option is set.
 
+// Anchor only for formatting, not visible in the man page.
 [[SocksPortFlagsMisc]]::
 Flags are processed left to right. If flags conflict, the last flag on the
 line is used, and all earlier flags are ignored. No error is issued for
@@ -1904,6 +1906,7 @@ is non-zero):
reject *:6881-6999
accept *:*
 
+// Anchor only for formatting, not visible in the man page.
 [[ExitPolicyDefault]]::
 Since the default exit policy uses accept/reject *, it applies to both
 IPv4 and IPv6 addresses.
@@ -2079,6 +2082,7 @@ is non-zero):
 If the address is absent, or resolves to both an IPv4 and an IPv6
 address, only listen to the IPv6 address.
 
+// Anchor only for formatting, not visible in the man page.
 [[ORPortFlagsExclusive]]::
 For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and
 IPv4Only and IPv6Only are mutually exclusive.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Remove erroneous section heading "ExitPolicyDefault"

[nickm]

commit 6d7c4c6ec2f76512c1142c1cb4453967d3bc1661
Author: Nick Mathewson 
Date:   Thu Mar 29 15:06:07 2018 -0400

Remove erroneous section heading "ExitPolicyDefault"

The anchor here was originally introduced to make sure that the
manpage would format correctly, but we had mistaken it for a section
anchor, and introduced a bogus section heading in 3563a2c8194ebe94.

Fixes bug 25582; bugfix on 0.3.3.1-alpha.
---
 changes/bug25582 | 3 +++
 doc/tor.1.txt| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug25582 b/changes/bug25582
new file mode 100644
index 0..609b94aac
--- /dev/null
+++ b/changes/bug25582
@@ -0,0 +1,3 @@
+  o Minor bugfixes (documentation):
+- Revert a misformatting issue in the ExitPolicy
+  documentation. Fixes bug 25582; bugfix on 0.3.3.1-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 80769412f..2c01a3ec9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1904,7 +1904,7 @@ is non-zero):
reject *:6881-6999
accept *:*
 
-[[ExitPolicyDefault]] **ExitPolicyDefault**::
+[[ExitPolicyDefault]]::
 Since the default exit policy uses accept/reject *, it applies to both
 IPv4 and IPv6 addresses.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

[nickm]

commit ac3e389dbd7224a23dfa12da7a15b748feb88435
Merge: 8f798b686 ff38c0589
Author: Nick Mathewson 
Date:   Thu Apr 5 08:21:38 2018 -0400

Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

 changes/bug25582 | 3 +++
 doc/tor.1.txt| 6 +-
 2 files changed, 8 insertions(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Fix the default for TOR_RUST_DEPENDENCIES

[nickm]

commit e3ad4957a8d06716d3e5dad9cda09ce236b941d1
Author: Nick Mathewson 
Date:   Fri Mar 30 08:53:58 2018 -0400

Fix the default for TOR_RUST_DEPENDENCIES

By default, we want to look at the crates directory of the
submodule, not the toplevel of the submodule.  Fixes bug 25679;
bugfix on 0.3.3.1-alpha.
---
 changes/bug25679 |  4 
 configure.ac | 12 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/changes/bug25679 b/changes/bug25679
new file mode 100644
index 0..9247a2915
--- /dev/null
+++ b/changes/bug25679
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation, rust):
+- Build correctly when the rust dependencies submodule is loaded,
+  but the TOR_RUST_DEPENDENCIES environment variable is not set.
+  Fixes bug 25679; bugfix on 0.3.3.1-alpha.
diff --git a/configure.ac b/configure.ac
index 2045e0d5f..143044956 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,23 +440,23 @@ if test "x$enable_rust" = "xyes"; then
 AC_MSG_CHECKING([rust crate dependencies])
 AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate 
mirror])
 if test "x$TOR_RUST_DEPENDENCIES" = "x"; then
-  TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/"
-  NEED_MOD=1
+  TOR_RUST_DEPENDENCIES="${srcdir}/src/ext/rust/crates"
 fi
+dnl Check whether the path exists before we try to cd into it.
 if test ! -d "$TOR_RUST_DEPENDENCIES"; then
   AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not 
exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable 
or allow cargo to fetch crates using --enable-cargo-online-mode.])
   ERRORED=1
 fi
+dnl Make the path absolute, since we'll be using it from within a
+dnl subdirectory.
+TOR_RUST_DEPENDENCIES=$(cd "$TOR_RUST_DEPENDENCIES" ; pwd)
+
 for dep in $rust_crates; do
   if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then
 AC_MSG_ERROR([Failure to find rust dependency 
$TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the 
TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using 
--enable-cargo-online-mode.])
 ERRORED=1
   fi
 done
-if test "x$NEED_MOD" = "x1"; then
-  dnl When looking for dependencies from cargo, pick right directory
-  TOR_RUST_DEPENDENCIES="../../src/ext/rust"
-fi
 if test "x$ERRORED" = "x"; then
   AC_MSG_RESULT([yes])
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm]

commit 43f31555827319077858fb3872c28764961b944a
Merge: 52846f728 ac3e389db
Author: Nick Mathewson 
Date:   Thu Apr 5 08:21:43 2018 -0400

Merge branch 'maint-0.3.3'

 changes/bug25582 |  3 +++
 changes/bug25679 |  4 
 configure.ac | 12 ++--
 doc/tor.1.txt|  6 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm]

commit 8a8b4ae69b4f8a28afcc245f98c11b34165ddaaf
Merge: 01037c106 ac3e389db
Author: Nick Mathewson 
Date:   Thu Apr 5 08:21:43 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25582 |  3 +++
 changes/bug25679 |  4 
 configure.ac | 12 ++--
 doc/tor.1.txt|  6 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'bug25679_033_squashed' into maint-0.3.3

[nickm]

commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69
Merge: ec8ee5412 e3ad4957a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:20:15 2018 -0400

Merge branch 'bug25679_033_squashed' into maint-0.3.3

 changes/bug25679 |  4 
 configure.ac | 12 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Remove erroneous section heading "ExitPolicyDefault"

[nickm]

commit 6d7c4c6ec2f76512c1142c1cb4453967d3bc1661
Author: Nick Mathewson 
Date:   Thu Mar 29 15:06:07 2018 -0400

Remove erroneous section heading "ExitPolicyDefault"

The anchor here was originally introduced to make sure that the
manpage would format correctly, but we had mistaken it for a section
anchor, and introduced a bogus section heading in 3563a2c8194ebe94.

Fixes bug 25582; bugfix on 0.3.3.1-alpha.
---
 changes/bug25582 | 3 +++
 doc/tor.1.txt| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug25582 b/changes/bug25582
new file mode 100644
index 0..609b94aac
--- /dev/null
+++ b/changes/bug25582
@@ -0,0 +1,3 @@
+  o Minor bugfixes (documentation):
+- Revert a misformatting issue in the ExitPolicy
+  documentation. Fixes bug 25582; bugfix on 0.3.3.1-alpha.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 80769412f..2c01a3ec9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1904,7 +1904,7 @@ is non-zero):
reject *:6881-6999
accept *:*
 
-[[ExitPolicyDefault]] **ExitPolicyDefault**::
+[[ExitPolicyDefault]]::
 Since the default exit policy uses accept/reject *, it applies to both
 IPv4 and IPv6 addresses.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Fix the default for TOR_RUST_DEPENDENCIES

[nickm]

commit e3ad4957a8d06716d3e5dad9cda09ce236b941d1
Author: Nick Mathewson 
Date:   Fri Mar 30 08:53:58 2018 -0400

Fix the default for TOR_RUST_DEPENDENCIES

By default, we want to look at the crates directory of the
submodule, not the toplevel of the submodule.  Fixes bug 25679;
bugfix on 0.3.3.1-alpha.
---
 changes/bug25679 |  4 
 configure.ac | 12 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/changes/bug25679 b/changes/bug25679
new file mode 100644
index 0..9247a2915
--- /dev/null
+++ b/changes/bug25679
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation, rust):
+- Build correctly when the rust dependencies submodule is loaded,
+  but the TOR_RUST_DEPENDENCIES environment variable is not set.
+  Fixes bug 25679; bugfix on 0.3.3.1-alpha.
diff --git a/configure.ac b/configure.ac
index 2045e0d5f..143044956 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,23 +440,23 @@ if test "x$enable_rust" = "xyes"; then
 AC_MSG_CHECKING([rust crate dependencies])
 AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate 
mirror])
 if test "x$TOR_RUST_DEPENDENCIES" = "x"; then
-  TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/"
-  NEED_MOD=1
+  TOR_RUST_DEPENDENCIES="${srcdir}/src/ext/rust/crates"
 fi
+dnl Check whether the path exists before we try to cd into it.
 if test ! -d "$TOR_RUST_DEPENDENCIES"; then
   AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not 
exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable 
or allow cargo to fetch crates using --enable-cargo-online-mode.])
   ERRORED=1
 fi
+dnl Make the path absolute, since we'll be using it from within a
+dnl subdirectory.
+TOR_RUST_DEPENDENCIES=$(cd "$TOR_RUST_DEPENDENCIES" ; pwd)
+
 for dep in $rust_crates; do
   if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then
 AC_MSG_ERROR([Failure to find rust dependency 
$TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the 
TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using 
--enable-cargo-online-mode.])
 ERRORED=1
   fi
 done
-if test "x$NEED_MOD" = "x1"; then
-  dnl When looking for dependencies from cargo, pick right directory
-  TOR_RUST_DEPENDENCIES="../../src/ext/rust"
-fi
 if test "x$ERRORED" = "x"; then
   AC_MSG_RESULT([yes])
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'bug25679_033_squashed' into maint-0.3.3

[nickm]

commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69
Merge: ec8ee5412 e3ad4957a
Author: Nick Mathewson 
Date:   Thu Apr 5 08:20:15 2018 -0400

Merge branch 'bug25679_033_squashed' into maint-0.3.3

 changes/bug25679 |  4 
 configure.ac | 12 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

[translation]

commit c906c15b856f72ac3b515fb0f07a920a9a80d865
Author: Translation commit bot 
Date:   Thu Apr 5 10:15:32 2018 +

Update translations for https_everywhere
---
 it/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd
index 6a6bc074b..2a28ce1ad 100644
--- a/it/https-everywhere.dtd
+++ b/it/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

[translation]

commit 3da884cb29645d2e2e1c06137b851c6321da9dbc
Author: Translation commit bot 
Date:   Thu Apr 5 10:15:41 2018 +

Update translations for https_everywhere_completed
---
 it/https-everywhere.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd
index c44fd39d7..2a28ce1ad 100644
--- a/it/https-everywhere.dtd
+++ b/it/https-everywhere.dtd
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -14,6 +15,7 @@
 
 
 
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed

[translation]

commit b46cb7ecd2ef1b89bb1aed622bbe7ee85bd27d4b
Author: Translation commit bot 
Date:   Thu Apr 5 07:17:36 2018 +

Update translations for tails-perl5lib_completed
---
 es.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/es.po b/es.po
index 132c8b851..801d6a831 100644
--- a/es.po
+++ b/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-03-15 12:15+\n"
-"PO-Revision-Date: 2018-03-31 15:29+\n"
-"Last-Translator: eulalio barbero espinosa \n"
+"PO-Revision-Date: 2018-04-05 07:08+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,10 +30,10 @@ msgstr "Error"
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
-msgstr "No se puede encontrar el dispostivo que ejecuta a Tails.  ¿Tal vez 
usaste la opción \"toram\"?"
+msgstr "No se puede encontrar el dispositivo que ejecuta a Tails.  ¿Tal vez 
usaste la opción 'toram'?"
 
 #: ../lib/Tails/RunningSystem.pm:192
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"
-msgstr "No se puede encontrar la unidad que ejecuta a Tails. ¿Tal vez usaste 
la opción \"toram\"?"
+msgstr "No se puede encontrar la unidad que ejecuta a Tails. ¿Tal vez usaste 
la opción 'toram'?"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib

[translation]

commit c4d50790b67ba59197cdb1f73da9bae577be68ae
Author: Translation commit bot 
Date:   Thu Apr 5 07:17:32 2018 +

Update translations for tails-perl5lib
---
 es.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/es.po b/es.po
index 132c8b851..801d6a831 100644
--- a/es.po
+++ b/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-03-15 12:15+\n"
-"PO-Revision-Date: 2018-03-31 15:29+\n"
-"Last-Translator: eulalio barbero espinosa \n"
+"PO-Revision-Date: 2018-04-05 07:08+\n"
+"Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,10 +30,10 @@ msgstr "Error"
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
-msgstr "No se puede encontrar el dispostivo que ejecuta a Tails.  ¿Tal vez 
usaste la opción \"toram\"?"
+msgstr "No se puede encontrar el dispositivo que ejecuta a Tails.  ¿Tal vez 
usaste la opción 'toram'?"
 
 #: ../lib/Tails/RunningSystem.pm:192
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"
-msgstr "No se puede encontrar la unidad que ejecuta a Tails. ¿Tal vez usaste 
la opción \"toram\"?"
+msgstr "No se puede encontrar la unidad que ejecuta a Tails. ¿Tal vez usaste 
la opción 'toram'?"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits