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

2017-12-21 Thread nickm 
commit 7d845976e3897fac8e78a4a26688ac57b660151b
Merge: 877dd1d6c 920208776
Author: Nick Mathewson 
Date:   Thu Dec 21 10:43:06 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/bug24666   |  7 
 src/or/circuitmux.c| 34 +--
 src/or/circuitmux.h|  2 +-
 src/or/or.h| 15 +
 src/or/relay.c | 82 --
 src/or/relay.h |  8 +
 src/test/test_circuitmux.c | 12 +++
 7 files changed, 126 insertions(+), 34 deletions(-)

diff --cc src/or/relay.h
index e15551ca5,9d160b7b9..c4f98d92f
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@@ -60,9 -63,15 +60,16 @@@ void cell_queue_append_packed_copy(circ
  void append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan,
cell_t *cell, cell_direction_t direction,
streamid_t fromstream);
+ 
+ void destroy_cell_queue_init(destroy_cell_queue_t *queue);
+ void destroy_cell_queue_clear(destroy_cell_queue_t *queue);
+ void destroy_cell_queue_append(destroy_cell_queue_t *queue,
+circid_t circid,
+uint8_t reason);
+ 
  void channel_unlink_all_circuits(channel_t *chan, smartlist_t *detached_out);
 -int channel_flush_from_first_active_circuit(channel_t *chan, int max);
 +MOCK_DECL(int, channel_flush_from_first_active_circuit,
 +  (channel_t *chan, int max));
  void assert_circuit_mux_okay(channel_t *chan);
  void update_circuit_on_cmux_(circuit_t *circ, cell_direction_t direction,
   const char *file, int lineno);
diff --cc src/test/test_circuitmux.c
index 9e8fb5496,d6b658c27..1ffa17247
--- a/src/test/test_circuitmux.c
+++ b/src/test/test_circuitmux.c
@@@ -34,11 -33,13 +34,12 @@@ test_cmux_destroy_cell_queue(void *arg
circuitmux_t *cmux = NULL;
channel_t *ch = NULL;
circuit_t *circ = NULL;
-   cell_queue_t *cq = NULL;
+   destroy_cell_queue_t *cq = NULL;
packed_cell_t *pc = NULL;
+   destroy_cell_t *dc = NULL;
  
 -#ifdef ENABLE_MEMPOOLS
 -  init_cell_pool();
 -#endif /* ENABLE_MEMPOOLS */
 +  scheduler_init();
 +
(void) arg;
  
cmux = circuitmux_alloc();
@@@ -61,20 -62,23 +62,19 @@@
tt_assert(!circ);
tt_assert(cq);
  
 -  tt_int_op(cq->n, ==, 3);
 +  tt_int_op(cq->n, OP_EQ, 3);
  
-   pc = cell_queue_pop(cq);
-   tt_assert(pc);
-   tt_mem_op(pc->body, OP_EQ, "\x00\x00\x00\x64\x04\x0a\x00\x00\x00", 9);
-   packed_cell_free(pc);
-   pc = NULL;
+   dc = destroy_cell_queue_pop(cq);
+   tt_assert(dc);
 -  tt_uint_op(dc->circid, ==, 100);
++  tt_uint_op(dc->circid, OP_EQ, 100);
  
 -  tt_int_op(circuitmux_num_cells(cmux), ==, 2);
 +  tt_int_op(circuitmux_num_cells(cmux), OP_EQ, 2);
  
   done:
circuitmux_free(cmux);
channel_free(ch);
packed_cell_free(pc);
+   tor_free(dc);
 -
 -#ifdef ENABLE_MEMPOOLS
 -  free_cell_pool();
 -#endif /* ENABLE_MEMPOOLS */
  }
  
  struct testcase_t circuitmux_tests[] = {



___
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.8

2017-12-20 Thread nickm 
commit 877dd1d6c8038cdef48a12a128eb08ae02ac628b
Merge: f7151387d 428f8a375
Author: Nick Mathewson 
Date:   Wed Dec 20 12:15:23 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-2017-12-06 | 4 +
 src/config/geoip | 12380 +++--
 src/config/geoip6|  3373 +---
 3 files changed, 10033 insertions(+), 5724 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.8

2017-12-12 Thread nickm 
commit f7151387d937bd1113f4c694b170305d80dde9fa
Merge: bc1ea4f47 1deda2106
Author: Nick Mathewson 
Date:   Mon Dec 11 16:56:31 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/bug24167| 7 +++
 src/or/connection.c | 4 
 2 files changed, 11 insertions(+)




___
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.8

2017-12-11 Thread nickm 
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson 
Date:   Mon Dec 11 16:54:11 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/ticket23856 | 4 
 src/or/rephist.c| 4 ++--
 src/or/router.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc src/or/router.c
index bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,9 @@@ mark_my_descriptor_dirty(const char *re
  }
  
  /** How frequently will we republish our descriptor because of large (factor
 - * of 2) shifts in estimated bandwidth? */
 + * of 2) shifts in estimated bandwidth? Note: We don't use this constant
 + * if our previous bandwidth estimate was exactly 0. */
- #define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
+ #define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60)
  
  /** Check whether bandwidth has changed a lot since the last time we announced
   * bandwidth. If so, mark our descriptor dirty. */



___
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.8

2017-12-01 Thread nickm 
commit f97f301b5b5605f559522ffae2159fc4d061817c
Merge: dc3890439 461e34bb3
Author: Nick Mathewson 
Date:   Fri Dec 1 12:13:39 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/bug24480 | 3 +++
 src/or/rendservice.c | 2 +-
 2 files changed, 4 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/master] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-12-01 Thread nickm 
commit dc3890439f156d4c79b153f13f7ecf3393362b29
Merge: 8f858de81 162a087e5
Author: Nick Mathewson 
Date:   Fri Dec 1 09:34:47 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump.




___
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.8

2017-12-01 Thread nickm 
commit ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e
Merge: 3030741b5 f49876d66
Author: Nick Mathewson 
Date:   Thu Nov 30 12:07:59 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/trove-2017-009   | 10 ++
 changes/trove-2017-011   |  8 
 changes/trove-2017-012-part1 |  6 ++
 src/common/crypto.c  | 16 +---
 src/or/rendservice.c |  4 +++-
 src/or/routerlist.c  |  5 -
 6 files changed, 44 insertions(+), 5 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.8

2017-12-01 Thread nickm 
commit 2e219291bee2d378344286ba091ba09527b07188
Merge: ba4a9cf0c 6bda6777c
Author: Nick Mathewson 
Date:   Thu Nov 30 12:21:36 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" to avoid version bump




___
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.8

2017-11-18 Thread nickm 
commit d388f9d879ebedf05c7f399f8b8eb3df9c43d3af
Merge: 800797e7f 831d3b794
Author: Nick Mathewson 
Date:   Sat Nov 18 11:01:33 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/bug18329-minimal | 6 ++
 src/or/router.c  | 9 +
 2 files changed, 15 insertions(+)

diff --cc src/or/router.c
index 01316c1bc,90b2431a2..bc7a2fcfc
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2748,6 -2385,16 +2748,15 @@@ router_dump_router_to_string(routerinfo
  smartlist_add_asprintf(chunks, "contact %s\n", ci);
}
  
+   if (options->BridgeRelay) {
+ const char *bd;
+ if (options->PublishServerDescriptor_ & BRIDGE_DIRINFO)
+   bd = "any";
+ else
+   bd = "none";
+ smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);
+   }
+ 
 -#ifdef CURVE25519_ENABLED
if (router->onion_curve25519_pkey) {
  char kbuf[128];
  base64_encode(kbuf, sizeof(kbuf),



___
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.8

2017-11-11 Thread nickm 
commit c9b76a12f5682babd2b8126930107a516cef5eff
Merge: faf568fa7 6f8c32b7d
Author: Nick Mathewson 
Date:   Sat Nov 11 12:23:33 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-2017-11-06 |4 +
 src/config/geoip | 9406 --
 src/config/geoip6|  848 -
 3 files changed, 6426 insertions(+), 3832 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.8

2017-10-25 Thread nickm 
commit faf568fa7e8cfbebc236b6aef743251b7e6b9df4
Merge: 9969b0dfd 82f8b27ff
Author: Nick Mathewson 
Date:   Wed Oct 25 09:28:15 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump




___
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.8

2017-10-24 Thread nickm 
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de
Merge: d4befa035 743eee493
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:04 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

"ours" merge to avoid version bump




___
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.8

2017-10-23 Thread nickm 
commit 8cc147aa834b076233c5448992e145b908123908
Merge: 9a1b38546 15a699462
Author: Nick Mathewson 
Date:   Mon Oct 23 09:04:56 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/ticket23910 | 3 +++
 src/or/config.c | 3 +++
 2 files changed, 6 insertions(+)

diff --cc src/or/config.c
index b93dfef92,bd168bef1..dd0eaa871
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -897,54 -842,9 +897,57 @@@ 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 "
 +"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
 +"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",
 +  "Bifroest orport=443 bridge "
 +"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
 +  "gabelmoo orport=443 "
 +"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"ipv6=[2001:638:a000:4140:::189]:443 "
 +"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",
 +  "maatuska orport=80 "
 +"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
 +"ipv6=[2001:67c:289c::9]:80 "
 +"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.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
++  "bastet orport=443 "
++"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
++"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
 +  NULL
 +};
 +
 +/** List of fallback directory authorities. The list is generated by opt-in of
 + * relays that meet certain stability criteria.
 + */
 +static const char *default_fallbacks[] = {
 +#include "fallback_dirs.inc"
 +  NULL
 +};
 +
  /** Add the default directory authorities directly into the trusted dir list,
 - * but only add them insofar as they share bits with type. */
 -static void
 + * but only add them insofar as they share bits with type.
 + * Each authority's bits are restricted to the bits shared with type.
 + * If type is ALL_DIRINFO or NO_DIRINFO (zero), add all authorities. */
 +STATIC void
  add_default_trusted_dir_authorities(dirinfo_type_t type)
  {
int i;



___
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.8

2017-10-23 Thread nickm 
commit 9a1b385462556b36dc08265eb9d96958e9d2ed29
Merge: 6f87a8589 5d219ecf9
Author: Nick Mathewson 
Date:   Mon Oct 23 08:58:28 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/longclaw_23592 | 3 +++
 src/or/config.c| 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index 7594c8989,97dffe505..b93dfef92
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -897,54 -842,9 +897,54 @@@ 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 "
 +"ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 "
 +"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",
 +  "Bifroest orport=443 bridge "
 +"37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
 +  "gabelmoo orport=443 "
 +"v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
 +"ipv6=[2001:638:a000:4140:::189]:443 "
 +"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",
 +  "maatuska orport=80 "
 +"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
 +"ipv6=[2001:67c:289c::9]:80 "
 +"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",
++"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
 +  NULL
 +};
 +
 +/** List of fallback directory authorities. The list is generated by opt-in of
 + * relays that meet certain stability criteria.
 + */
 +static const char *default_fallbacks[] = {
 +#include "fallback_dirs.inc"
 +  NULL
 +};
 +
  /** Add the default directory authorities directly into the trusted dir list,
 - * but only add them insofar as they share bits with type. */
 -static void
 + * but only add them insofar as they share bits with type.
 + * Each authority's bits are restricted to the bits shared with type.
 + * If type is ALL_DIRINFO or NO_DIRINFO (zero), add all authorities. */
 +STATIC void
  add_default_trusted_dir_authorities(dirinfo_type_t type)
  {
int i;



___
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.8

2017-10-05 Thread nickm 
commit 91c17ffbd61348e63cac81e90583f0b22b3c17d4
Merge: d6bdec159 2e21493a8
Author: Nick Mathewson 
Date:   Thu Oct 5 11:04:59 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-october2017 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
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.8

2017-10-05 Thread nickm 
commit d6bdec1595751eba397d2ea20318538fcfb9c78a
Merge: 8e52c4658 b9d9b16b7
Author: Nick Mathewson 
Date:   Thu Oct 5 11:03:35 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-october2017 |4 +
 src/config/geoip  | 8683 +++--
 src/config/geoip6 |  653 ++--
 3 files changed, 5654 insertions(+), 3686 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.8

2017-09-07 Thread nickm 
commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 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.8

2017-08-03 Thread nickm 
commit 93b28972c10cfc87ab1865bead3ba713901d9d79
Merge: 0e7558ab6 1280de42a
Author: Nick Mathewson 
Date:   Thu Aug 3 08:44:31 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-august2017 | 4 +
 src/config/geoip | 10796 -
 src/config/geoip6|   607 ++-
 3 files changed, 7161 insertions(+), 4246 deletions(-)



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