[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-15 Thread nickm 
commit e6376a8004072fde832da77aa6369075dcdcbe8b
Merge: 67877f5 f7ed4a7
Author: Nick Mathewson <ni...@torproject.org>
Date:   Wed Feb 15 07:52:41 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

_______
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-15 Thread nickm 
commit ed806843dc8e7942a2a0abfbb2ae374e11963feb
Merge: 75fe218 3781f24
Author: Nick Mathewson 
Date:   Wed Feb 15 07:47:21 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug20384 | 10 ++
 changes/trove-2017-001.2 |  8 
 src/or/routerparse.c | 49 +---
 3 files changed, 48 insertions(+), 19 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-13 Thread arma 
commit 5c4235888af142b72aa6b88737bcf1020797e35c
Merge: 75fe218 e778a41
Author: Roger Dingledine 
Date:   Mon Feb 13 15:28:50 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug20384 | 10 ++
 1 file changed, 10 insertions(+)

___
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-13 Thread nickm 
commit 75fe218b166b4d4e46b50205104e9eeaa136e904
Merge: 4bce207 43c18b1
Author: Nick Mathewson 
Date:   Mon Feb 13 14:37:49 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-february2017 | 4 +
 src/config/geoip   | 10832 ---
 src/config/geoip6  |  1651 ++-
 3 files changed, 7351 insertions(+), 5136 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm 
commit 4bce2072acaca38d40086c943d8f332ed2c2cf50
Merge: 86d5a6f f2a3041
Author: Nick Mathewson 
Date:   Tue Feb 7 10:39:03 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug18710 | 6 ++
 src/or/dnsserv.c | 4 +---
 2 files changed, 7 insertions(+), 3 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm 
commit 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334
Merge: 0a43134 5446cb8
Author: Nick Mathewson 
Date:   Tue Feb 7 09:29:27 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

"ours" merge to avoid reverting 17354, which was already fixed in
0.2.7.4-rc.

___
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm 
commit 0a43134009a431ecd734a4c122d5de0d63529800
Merge: 115cefd c6f2ae5
Author: Nick Mathewson 
Date:   Tue Feb 7 09:20:13 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

This is an "ours" merge to avoid conflicts on the authority list:
the 0.2.7 branch already has the tonga->bifroest merge.

___
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm 
commit 115cefdeeefd99f435948bfe42b1ce842019edfb
Merge: eb72365 e6965f7
Author: Nick Mathewson 
Date:   Tue Feb 7 08:55:07 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/rsa_init_bug | 7 +++
 src/common/crypto.c  | 4 +++-
 2 files changed, 10 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/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-02-07 Thread nickm 
commit eb72365554451f5e129169bb1216a9610f7ff183
Merge: 8c91cbb 8936c50
Author: Nick Mathewson <ni...@torproject.org>
Date:   Tue Feb 7 08:39:25 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

_______
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2017-01-11 Thread nickm 
commit 8c91cbb6ca579145e84f940953c33911eb1ce72b
Merge: 2673b4b 54771bc
Author: Nick Mathewson 
Date:   Wed Jan 11 09:12:51 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-january2017 |4 +
 src/config/geoip  | 3160 +
 src/config/geoip6 |  561 +++-
 3 files changed, 2552 insertions(+), 1173 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-12-20 Thread nickm 
commit 2673b4b7a87bbdc880dd235f490dfb7b8f3c64c9
Merge: a9c8a5f b6227ed
Author: Nick Mathewson 
Date:   Tue Dec 20 18:23:19 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-12-20 Thread nickm 
commit a9c8a5ff18c1944ddcea0116419edc2f199583b8
Merge: b49369b b18bde2
Author: Nick Mathewson 
Date:   Tue Dec 20 18:14:21 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug21018 | 11 +++
 src/or/rendcache.c   |  6 --
 src/or/routerparse.c |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --cc src/or/rendcache.c
index d4bdd68,000..e7b1ce9
mode 100644,00..100644
--- a/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@@ -1,898 -1,0 +1,900 @@@
 +/* Copyright (c) 2015, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file rendcache.c
 + * \brief Hidden service desriptor cache.
 + **/
 +
 +#include "rendcache.h"
 +
 +#include "config.h"
 +#include "rephist.h"
 +#include "routerlist.h"
 +#include "routerparse.h"
 +
 +/** Map from service id (as generated by rend_get_service_id) to
 + * rend_cache_entry_t. */
 +static strmap_t *rend_cache = NULL;
 +
 +/** Map from descriptor id to rend_cache_entry_t; only for hidden service
 + * directories. */
 +static digestmap_t *rend_cache_v2_dir = NULL;
 +
 +/** (Client side only) Map from service id to rend_cache_failure_t. This
 + * cache is used to track intro point(IP) failures so we know when to keep
 + * or discard a new descriptor we just fetched. Here is a description of the
 + * cache behavior.
 + *
 + * Everytime tor discards an IP (ex: receives a NACK), we add an entry to
 + * this cache noting the identity digest of the IP and it's failure type for
 + * the service ID. The reason we indexed this cache by service ID is to
 + * differentiate errors that can occur only for a specific service like a
 + * NACK for instance. It applies for one but maybe not for the others.
 + *
 + * Once a service descriptor is fetched and considered valid, each IP is
 + * looked up in this cache and if present, it is discarded from the fetched
 + * descriptor. At the end, all IP(s) in the cache, for a specific service
 + * ID, that were NOT present in the descriptor are removed from this cache.
 + * Which means that if at least one IP was not in this cache, thus usuable,
 + * it's considered a new descriptor so we keep it. Else, if all IPs were in
 + * this cache, we discard the descriptor as it's considered unsuable.
 + *
 + * Once a descriptor is removed from the rend cache or expires, the entry
 + * in this cache is also removed for the service ID.
 + *
 + * This scheme allows us to not realy on the descriptor's timestamp (which
 + * is rounded down to the hour) to know if we have a newer descriptor. We
 + * only rely on the usability of intro points from an internal state. */
 +static strmap_t *rend_cache_failure = NULL;
 +
 +/** DOCDOC */
 +static size_t rend_cache_total_allocation = 0;
 +
 +/** Initializes the service descriptor cache.
 +*/
 +void
 +rend_cache_init(void)
 +{
 +  rend_cache = strmap_new();
 +  rend_cache_v2_dir = digestmap_new();
 +  rend_cache_failure = strmap_new();
 +}
 +
 +/** Return the approximate number of bytes needed to hold e. */
 +static size_t
 +rend_cache_entry_allocation(const rend_cache_entry_t *e)
 +{
 +  if (!e)
 +return 0;
 +
 +  /* This doesn't count intro_nodes or key size */
 +  return sizeof(*e) + e->len + sizeof(*e->parsed);
 +}
 +
 +/** DOCDOC */
 +size_t
 +rend_cache_get_total_allocation(void)
 +{
 +  return rend_cache_total_allocation;
 +}
 +
 +/** Decrement the total bytes attributed to the rendezvous cache by n. */
 +static void
 +rend_cache_decrement_allocation(size_t n)
 +{
 +  static int have_underflowed = 0;
 +
 +  if (rend_cache_total_allocation >= n) {
 +rend_cache_total_allocation -= n;
 +  } else {
 +rend_cache_total_allocation = 0;
 +if (! have_underflowed) {
 +  have_underflowed = 1;
 +  log_warn(LD_BUG, "Underflow in rend_cache_decrement_allocation");
 +}
 +  }
 +}
 +
 +/** Increase the total bytes attributed to the rendezvous cache by n. */
 +static void
 +rend_cache_increment_allocation(size_t n)
 +{
 +  static int have_overflowed = 0;
 +  if (rend_cache_total_allocation <= SIZE_MAX - n) {
 +rend_cache_total_allocation += n;
 +  } else {
 +rend_cache_total_allocation = SIZE_MAX;
 +if (! have_overflowed) {
 +  have_overflowed = 1;
 +  log_warn(LD_BUG, "Overflow in rend_cache_increment_allocation");
 +}
 +  }
 +}
 +
 +/** Helper: free a rend cache failure intro object. */
 +static void
 +rend_cache_failure_intro_entry_free(rend_cache_failure_intro_t *entry)
 +{
 +  if (entry == NULL) {
 +return;
 +  }
 +  tor_free(entry);
 +}
 +
 +static void
 +rend_cache_failure_intro_entry_free_(void *entry)
 +{
 +  rend_cache_failure_intro_entry_free(entry);
 +}
 +
 +/** Allocate a rend cache failure intro object and return it. failure
 + * is set into the object. This function can not fail. */
 +static rend_cache_failure_intro_t *
 +rend_cache_failure_intro_entry_new(rend_intro_point_failure_t failure)
 +{
 +  rend_cache_failure_intro_t *entry =

[tor-commits] [tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-12-09 Thread nickm 
commit b49369badd28d5895f1d26b74be888298246b05a
Merge: f5fdf18 3d9f8ff
Author: Nick Mathewson 
Date:   Fri Dec 9 08:34:12 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-december2016 |4 +
 src/config/geoip   | 6259 ++--
 src/config/geoip6  | 1193 -
 3 files changed, 4705 insertions(+), 2751 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-11-07 Thread nickm 
commit f5fdf188b9c2e218e89f55e4fb26fcd3b2abe44b
Merge: ec718aa 6c2174d
Author: Nick Mathewson 
Date:   Mon Nov 7 09:30:42 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-november2016 |4 +
 src/config/geoip   | 4025 
 src/config/geoip6  | 2490 ++-
 3 files changed, 3407 insertions(+), 3112 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-10-06 Thread nickm 
commit ec718aa83914e848ca9ee5e828731477a410e484
Merge: 11edbf4 12a7298
Author: Nick Mathewson 
Date:   Thu Oct 6 09:59:18 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-october2016 | 4 +
 src/config/geoip  | 63919 +---
 src/config/geoip6 |  1496 +-
 3 files changed, 48664 insertions(+), 16755 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-09-07 Thread nickm 
commit 11edbf480870975a354ec13ee67958492a0fd690
Merge: f60da19 52a99cb
Author: Nick Mathewson 
Date:   Wed Sep 7 13:54:03 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-september2016 | 4 +
 src/config/geoip| 30846 +-
 src/config/geoip6   |  2373 ++--
 3 files changed, 10566 insertions(+), 22657 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-08-12 Thread nickm 
commit db372addc8534dc6e4639fe943179943b276b051
Merge: 4d70ed7 742ff2c
Author: Nick Mathewson 
Date:   Fri Aug 12 10:27:08 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-august2016 | 4 +
 src/config/geoip | 14009 +
 src/config/geoip6|  1108 +++-
 3 files changed, 8582 insertions(+), 6539 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-07-19 Thread nickm 
commit 4d70ed7be097593ab9ef80b52540e49d30baaf03
Merge: 7c25b41 210928f
Author: Nick Mathewson 
Date:   Tue Jul 19 12:32:14 2016 +0200

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-july2016 |4 +
 src/config/geoip   | 4615 +---
 src/config/geoip6  |  982 ---
 3 files changed, 3879 insertions(+), 1722 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-07-05 Thread nickm 
commit 7c25b41c8cfffebddbc7ba4d66aa345642eebc1f
Merge: 6e96aad 92891de
Author: Nick Mathewson 
Date:   Tue Jul 5 13:52:04 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/19271 | 2 ++
 1 file changed, 2 insertions(+)

___
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-07-05 Thread nickm 
commit 6e96aadadbe9ac49582c770e9ff11b3c2876abf3
Merge: 80089c9 c28ba99
Author: Nick Mathewson 
Date:   Tue Jul 5 12:22:47 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 src/or/config.c | 3 ---
 1 file changed, 3 deletions(-)

diff --cc src/or/config.c
index 3b35b5a,89b6087..0f36738
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -857,41 -841,6 +857,38 @@@ escaped_safe_str(const char *address
  return escaped(address);
  }
  
 +/** List of default directory authorities */
 +
 +static const char *default_authorities[] = {
 +  "moria1 orport=9101 "
 +"v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
 +"128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
 +  "tor26 orport=443 "
 +"v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
 +"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
 +  "dizum orport=443 "
 +"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 +"194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
 +  "Tonga orport=443 bridge "
 +"82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
 +  "gabelmoo orport=443 "
 +"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 +  "dannenberg orport=443 "
 +"v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
 +"193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-   "urras orport=80 "
- "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
- "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
 +  "maatuska orport=80 "
 +"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
 +"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
 +  "Faravahar orport=443 "
 +"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
 +"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
 +  "longclaw orport=443 "
 +"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
 +"199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
 +  NULL
 +};
 +
  /** Add the default directory authorities directly into the trusted dir list,
   * but only add them insofar as they share bits with type.
   * Each authority's bits are restricted to the bits shared with type.

___
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-06-13 Thread nickm 
commit 80089c9e7c16f38e398e99cbc773c3182cee9229
Merge: 5854b19 b4bb886
Author: Nick Mathewson 
Date:   Mon Jun 13 10:48:56 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-jun2016 |4 +
 src/config/geoip  | 3349 +++--
 src/config/geoip6 | 1366 
 3 files changed, 3527 insertions(+), 1192 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-05-09 Thread nickm 
commit 7fe80c29056d7e98b9443e151343c886cf8c7dd3
Merge: 1a065ce 0b477bf
Author: Nick Mathewson 
Date:   Mon May 9 14:56:56 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-may2016 |4 +
 src/config/geoip  | 6991 -
 src/config/geoip6 |  904 +--
 3 files changed, 4631 insertions(+), 3268 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-04-07 Thread nickm 
commit ad4ff7a5b93a9236b6084548798815540ad91cbe
Merge: 183d465 2ce99b9
Author: Nick Mathewson 
Date:   Thu Apr 7 10:45:46 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-april2016 |4 +
 src/config/geoip| 3255 +++
 src/config/geoip6   | 2549 +
 3 files changed, 4455 insertions(+), 1353 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-03-09 Thread nickm 
commit 17cfdb358cae63477a120182784599dae0538cd7
Merge: 67e5d49 443dddb
Author: Nick Mathewson 
Date:   Wed Mar 9 10:36:50 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-march2016 |4 +
 src/config/geoip| 8496 +++
 src/config/geoip6   | 2270 ++---
 3 files changed, 6524 insertions(+), 4246 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-02-11 Thread nickm 
commit be6174f8f6aaaf8f990eb56c5cba16bc5ec0fcea
Merge: d920cbb 740421a
Author: Nick Mathewson 
Date:   Thu Feb 11 13:01:46 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug18162   |  7 +++
 src/common/container.c | 37 -
 2 files changed, 27 insertions(+), 17 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-02-05 Thread nickm 
commit d920cbb82c2203b328d66d6c9d8f28fd35608560
Merge: 7d1fe7c 44ad3be
Author: Nick Mathewson 
Date:   Fri Feb 5 08:13:35 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-february2016 |4 +
 src/config/geoip   | 2144 +---
 src/config/geoip6  |  864 ++
 3 files changed, 2328 insertions(+), 684 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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-01-19 Thread nickm 
commit 534a0ba59b4d772b0e3e6a1dfc5050d534fdb9fc
Merge: 8335b1f e2efa9e
Author: Nick Mathewson 
Date:   Tue Jan 19 08:30:39 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 src/common/crypto.c |4 +++-
 1 file changed, 3 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/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2016-01-18 Thread nickm 
commit 8335b1f9a91076f100e7d3ba6b45f3ed9fc2986a
Merge: 83dfcfb db81565
Author: Nick Mathewson 
Date:   Mon Jan 18 20:00:16 2016 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug18089|6 ++
 src/common/crypto.c |8 
 2 files changed, 14 insertions(+)

___
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2015-12-08 Thread nickm 
commit eeb9751eadd148e5077cedb28f75e756b47281c0
Merge: e9bf584 b53ff86
Author: Nick Mathewson 
Date:   Tue Dec 8 09:43:42 2015 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug17781 |3 +++
 1 file changed, 3 insertions(+)

___
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2015-12-08 Thread nickm 
commit c6a337557ae5c73e8dc8208b18f902e9eeb21404
Merge: eeb9751 1adc2bf
Author: Nick Mathewson 
Date:   Tue Dec 8 10:23:41 2015 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug17772|7 +++
 src/or/routerlist.c |   10 --
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --cc src/or/routerlist.c
index 03729bd,af8e68e..79a5bb3
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -1501,8 -1498,17 +1501,14 @@@ router_pick_directory_server_impl(dirin
  if ((type & EXTRAINFO_DIRINFO) &&
  !router_supports_extrainfo(node->identity, is_trusted_extrainfo))
continue;
- if (for_guard && node->using_as_guard)
-   continue; /* Don't make the same node a guard twice. */
 -if ((type & MICRODESC_DIRINFO) && !is_trusted &&
 -!node->rs->version_supports_microdesc_cache)
 -  continue;
+ /* Don't make the same node a guard twice */
+ if (for_guard && node->using_as_guard) {
+   continue;
+ }
+ /* Ensure that a directory guard is actually a guard node. */
+ if (for_guard && !node->is_possible_guard) {
+   continue;
+ }
  if (try_excluding &&
  routerset_contains_routerstatus(options->ExcludeNodes, status,
  country)) {

___
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.7] Merge branch 'maint-0.2.6' into maint-0.2.7

2015-12-07 Thread nickm 
commit 9c66afe7720aa32a2640564bbf8b0af64e394ba5
Merge: e408aa3 089ee13
Author: Nick Mathewson 
Date:   Mon Dec 7 10:11:21 2015 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/geoip-december2015 |4 +
 src/config/geoip   | 4547 
 src/config/geoip6  | 2580 +
 3 files changed, 5512 insertions(+), 1619 deletions(-)

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