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

2022-01-24 Thread dgoulet
commit 1b58399b07a17c2745624f35780fd3ddbe7a0251
Merge: 986730e82c 421ce94395
Author: David Goulet 
Date:   Mon Jan 24 10:49:32 2022 -0500

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2022-01-18 Thread dgoulet
commit 4ab4521c3143123bf2da410c483eb8a9c95455a0
Merge: 49c758af47 501d8bbd4c
Author: David Goulet 
Date:   Tue Jan 18 13:15:38 2022 -0500

Merge branch 'maint-0.3.5' into maint-0.4.5

 src/feature/relay/router.c | 4 ++--
 1 file changed, 2 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.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2022-01-18 Thread dgoulet
commit 49c758af47ce5e45154dbf445519b422d79f30ad
Merge: aac5731f86 e523480691
Author: David Goulet 
Date:   Tue Jan 18 13:15:29 2022 -0500

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40544 | 3 +++
 src/app/main/main.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/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2022-01-18 Thread dgoulet
commit aac5731f86399a3ac37720f9d0c4cffacd8eb38a
Merge: 882fd1f0d4 72041c6306
Author: David Goulet 
Date:   Tue Jan 18 13:12:13 2022 -0500

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40509  | 4 
 src/core/or/protover.c   | 4 ++--
 src/test/test_protover.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc src/core/or/protover.c
index cb9a03d6ec,e047bfe200..d45246cb83
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@@ -435,10 -422,9 +435,10 @@@ protover_get_supported_protocols(void
return
  "Cons=1-2 "
  "Desc=1-2 "
 -"DirCache=1-2 "
 +"DirCache=2 "
 +"FlowCtrl=1 "
- "HSDir=1-2 "
- "HSIntro=3-5 "
+ "HSDir=2 "
 -"HSIntro=4 "
++"HSIntro=4-5 "
  "HSRend=1-2 "
  "Link=1-5 "
  #ifdef HAVE_WORKING_TOR_TLS_GET_TLSSECRETS
diff --cc src/test/test_protover.c
index 016cee7f15,3fbfe3a682..44febe0fa6
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@@ -342,21 -361,23 +342,21 @@@ test_protover_supports_version(void *ar
   * Hard-coded here, because they are not in the code, or not exposed in the
   * headers. */
  #define PROTOVER_LINKAUTH_V1 1
 -#define PROTOVER_LINKAUTH_V3 3
 -
 +#define PROTOVER_LINKAUTH_V2 2
  #define PROTOVER_RELAY_V1 1
 -#define PROTOVER_RELAY_V2 2
  
 +/* Deprecated HSIntro versions */
 +#define PROTOVER_HS_INTRO_DEPRECATED_1 1
 +#define PROTOVER_HS_INTRO_DEPRECATED_2 2
  /* Highest supported HSv2 introduce protocol version.
 - * Hard-coded here, because it does not appear anywhere in the code.
   * It's not clear if we actually support version 2, see #25068. */
 -#define PROTOVER_HSINTRO_V2 4
 +#define PROTOVER_HS_INTRO_V2 3
  
 -/* HSv2 Rend and HSDir protocol versions.
 - * Hard-coded here, because they do not appear anywhere in the code. */
 +/* HSv2 Rend and HSDir protocol versions. */
  #define PROTOVER_HS_RENDEZVOUS_POINT_V2 1
- #define PROTOVER_HSDIR_V2 1
+ #define PROTOVER_HSDIR_V2 2
  
 -/* DirCache, Desc, Microdesc, and Cons protocol versions.
 - * Hard-coded here, because they do not appear anywhere in the code. */
 +/* DirCache, Desc, Microdesc, and Cons protocol versions. */
  #define PROTOVER_DIRCACHE_V1 1
  #define PROTOVER_DIRCACHE_V2 2
  



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


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

2021-11-08 Thread ahf
commit 882fd1f0d45656e0535e70b5e115281b39ac6307
Merge: a7fe37f1fa 4a24673436
Author: Alexander Færøy 
Date:   Mon Nov 8 14:16:18 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/bug40429|  5 +
 changes/ticket40511 |  6 ++
 configure.ac| 14 +-
 3 files changed, 24 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.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-11-05 Thread dgoulet
commit 47adba879ca215ef1cd5abae93a32e17063eccb2
Merge: 40e2106031 439e17180c
Author: David Goulet 
Date:   Fri Nov 5 10:35:08 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 src/core/or/protover.c| 113 +-
 src/core/or/protover.h|   4 ++
 src/feature/dirauth/dirvote.c |  12 ++---
 3 files changed, 121 insertions(+), 8 deletions(-)

diff --cc src/core/or/protover.c
index aa96cafff9,82e4f64c94..8b307a8a2f
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@@ -390,11 -387,38 +395,43 @@@ protocol_list_supports_protocol_or_late
  const char *
  protover_get_supported_protocols(void)
  {
 +  /* WARNING!
 +   *
 +   * Remember to edit the SUPPORTED_PROTOCOLS list in protover.rs if you
 +   * are editing this list.
 +   */
+ 
+   /*
+* XXX: WARNING!
+*
+* Be EXTREMELY CAREFUL when *removing* versions from this list.  If you
+* remove an entry while it still appears as "recommended" in the consensus,
+* you'll cause all the instances without it to warn.
+*
+* If you remove an entry while it still appears as "required" in the
+* consensus, you'll cause all the instances without it to refuse to connect
+* to the network, and shut down.
+*
+* If you need to remove a version from this list, you need to make sure 
that
+* it is not listed in the _current consensuses_: just removing it from the
+* required list below is NOT ENOUGH.  You need to remove it from the
+* required list, and THEN let the authorities upgrade and vote on new
+* consensuses without it. Only once those consensuses are out is it safe to
+* remove from this list.
+*
+* One concrete example of a very dangerous race that could occur:
+*
+* Suppose that the client supports protocols "HsDir=1-2" and the consensus
+* requires protocols "HsDir=1-2.  If the client supported protocol list is
+* then changed to "HSDir=2", while the consensus stills lists "HSDir=1-2",
+* then these clients, even very recent ones, will shut down because they
+* don't support "HSDir=1".
+*
+* And so, changes need to be done in strict sequence as described above.
+*
+* XXX: WARNING!
+*/
+ 
return
  "Cons=1-2 "
  "Desc=1-2 "
@@@ -410,10 -433,83 +447,84 @@@
  "LinkAuth=3 "
  #endif
  "Microdesc=1-2 "
 -"Relay=1-2";
 +"Padding=2 "
 +"Relay=1-3";
  }
  
+ /*
+  * XXX: WARNING!
+  *
+  * The recommended and required values are hardwired, to avoid disaster. 
Voting
+  * on the wrong subprotocols here has the potential to take down the network.
+  *
+  * In particular, you need to be EXTREMELY CAREFUL before adding new versions
+  * to the required protocol list.  Doing so will cause every relay or client
+  * that doesn't support those versions to refuse to connect to the network and
+  * shut down.
+  *
+  * Note that this applies to versions, not just protocols!  If you say that
+  * Foobar=8-9 is required, and the client only has Foobar=9, it will shut 
down.
+  *
+  * It is okay to do this only for SUPER OLD relays that are not supported on
+  * the network anyway.  For clients, we really shouldn't kick them off the
+  * network unless their presence is causing serious active harm.
+  *
+  * The following required and recommended lists MUST be changed BEFORE the
+  * supported list above is changed, so that these lists appear in the
+  * consensus BEFORE clients need them.
+  *
+  * Please, see the warning in protocol_get_supported_versions().
+  *
+  * XXX: WARNING!
+  */
+ 
+ /*
+  * NOTE: A keen observer will notice that "LinkAuth" is not recommended nor
+  * required.  This is due to the HAVE_WORKING_TOR_TLS_GET_TLSSECRETS define
+  * that can either set "1" or "1,3" and so we can't enforce one or the other
+  * due to this uncertainty on how tor was built.
+  */
+ 
+ /** Return the recommended client protocols list that directory authorities
+  * put in the consensus. */
+ const char *
+ protover_get_recommended_client_protocols(void)
+ {
+   return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
+  "Link=4 Microdesc=1-2 Relay=2";
+ }
+ 
+ /** Return the recommended relay protocols list that directory authorities
+  * put in the consensus. */
+ const char *
+ protover_get_recommended_relay_protocols(void)
+ {
+   return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
+  "Link=4 Microdesc=1-2 Relay=2";
+ }
+ 
+ /** Return the required client protocols list that directory authorities
+  * put in the consensus. */
+ const char *
+ protover_get_required_client_protocols(void)
+ {
+   return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
+  "Link=4 Microdesc=1-2 Relay=2";
+ }
+ 
+ /** Return the required relay protocols list that directory authorities
+  * put in the consensus. */
+ const char *
+ protover_get_required_relay_protocols(void)
+ {
+   return "Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 

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

2021-11-05 Thread ahf
commit 40e21060312ebcd0ff5ab4db5fc22f93bed474de
Merge: ea5eebf431 cfd1482f78
Author: Alexander Færøy 
Date:   Fri Nov 5 03:10:28 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5

 .gitlab-ci.yml | 8 
 1 file changed, 8 insertions(+)




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


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

2021-11-03 Thread dgoulet
commit 1e3e921d7d2e7bce2f2b7e35ca085a745d242b66
Merge: 77f5bfa60e 1902edaf52
Author: David Goulet 
Date:   Wed Nov 3 09:47:43 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 doc/asciidoc-helper.sh  | 5 +++--
 scripts/ci/ci-driver.sh | 2 +-
 2 files changed, 4 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/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-29 Thread ahf
commit 77f5bfa60e0030d6c26eb01ea5fb1a04e0b2d6bb
Merge: 3ebf217009 5c8deef9b6
Author: Alexander Færøy 
Date:   Fri Oct 29 16:56:33 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2021-10-29 Thread dgoulet
commit 3ebf21700988132f5936383840a323bb4cab39dc
Merge: f5bd575401 92fedb9f44
Author: David Goulet 
Date:   Fri Oct 29 09:20:21 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2021-10-28 Thread dgoulet
commit 7c4fd150cd19ebdafe64b800282184014b43d9fb
Merge: 97c976778a fa438b6cf0
Author: David Goulet 
Date:   Thu Oct 28 09:42:25 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2021-10-26 Thread dgoulet
commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc
Merge: d4af7bdb26 14385ce71e
Author: David Goulet 
Date:   Tue Oct 26 14:33:49 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 scripts/ci/ci-driver.sh | 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/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-26 Thread dgoulet
commit d4af7bdb2616aaa73361a31b589c62548fc45700
Merge: 00ff6dffa1 66193ee708
Author: David Goulet 
Date:   Tue Oct 26 11:31:14 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2021-10-26 Thread dgoulet
commit 6f776001cb95c0ad498ebbe8665f74260d135dd9
Merge: 446135aff0 9280f32fc0
Author: David Goulet 
Date:   Tue Oct 26 09:17:52 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2021-10-21 Thread dgoulet
commit 1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8
Merge: 0135fb028c 66e8e0f71b
Author: David Goulet 
Date:   Thu Oct 21 10:01:38 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40493  |   2 +
 src/app/config/fallback_dirs.inc | 951 +++
 2 files changed, 472 insertions(+), 481 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.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-20 Thread ahf
commit 5717b88bcb88d374b7b934622f0b7bf62cdab05c
Merge: fdc7549b61 7372739765
Author: Alexander Færøy 
Date:   Wed Oct 20 21:47:17 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket30477|  4 
 src/feature/relay/router.c | 23 +++
 src/feature/relay/router.h |  1 +
 3 files changed, 28 insertions(+)

diff --cc src/feature/relay/router.c
index 2696b8633b,7ea2a4e719..0589786619
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@@ -1140,11 -1121,11 +1159,15 @@@ init_keys(void
  log_err(LD_FS, "Error writing hashed fingerprint to file");
  return -1;
}
 +  if (router_write_fingerprint(0, 1)) {
 +log_err(LD_FS, "Error writing ed25519 identity to file");
 +return -1;
 +  }
  
+   /* Display URL to bridge status page. */
+   if (! public_server_mode(options))
+ router_announce_bridge_status_page();
+ 
if (!authdir_mode(options))
  return 0;
/* 6. [authdirserver only] load approved-routers file */
diff --cc src/feature/relay/router.h
index aa03c27142,2d9ff3f8f3..9556a66e68
--- a/src/feature/relay/router.h
+++ b/src/feature/relay/router.h
@@@ -125,29 -115,11 +125,30 @@@ void router_reset_warnings(void)
  void router_free_all(void);
  
  #ifdef ROUTER_PRIVATE
 -/* Used only by router.c and test.c */
 +/* Used only by router.c and the unit tests */
  STATIC void get_platform_str(char *platform, size_t len);
 -STATIC int router_write_fingerprint(int hashed);
 +STATIC int router_write_fingerprint(int hashed, int ed25519_identity);
 +STATIC smartlist_t *get_my_declared_family(const or_options_t *options);
+ STATIC void router_announce_bridge_status_page(void);
 -#endif
 +STATIC int load_stats_file(const char *filename, const char *ts_tag,
 +   time_t now, char **out);
 +
 +#ifdef TOR_UNIT_TESTS
 +extern time_t desc_clean_since;
 +extern const char *desc_dirty_reason;
 +void set_server_identity_key_digest_testing(const uint8_t *digest);
 +MOCK_DECL(STATIC const struct curve25519_keypair_t *,
 +   get_current_curve25519_keypair,(void));
 +
 +MOCK_DECL(STATIC int,
 +  router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out));
 +STATIC extrainfo_t *router_build_fresh_signed_extrainfo(
 +  const routerinfo_t *ri);
 +STATIC void router_update_routerinfo_from_extrainfo(routerinfo_t *ri,
 +const extrainfo_t *ei);
 +STATIC int router_dump_and_sign_routerinfo_descriptor_body(routerinfo_t *ri);
 +#endif /* defined(TOR_UNIT_TESTS) */
 +
 +#endif /* defined(ROUTER_PRIVATE) */
  
  #endif /* !defined(TOR_ROUTER_H) */



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


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

2021-10-20 Thread ahf
commit fdc7549b61443a1ffd723c5a497b9c96c78d4a1a
Merge: d949a2f924 5a043825d0
Author: Alexander Færøy 
Date:   Wed Oct 20 17:36:06 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/bug40371| 6 ++
 src/feature/relay/dns.c | 9 -
 2 files changed, 6 insertions(+), 9 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.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-19 Thread dgoulet
commit d949a2f924bfabd4aacf48e884d99cd6a8db61ef
Merge: d0053fdfb5 44e105c27f
Author: David Goulet 
Date:   Tue Oct 19 10:29:15 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2021-09-13 Thread dgoulet
commit 0dbb2f53b933cb089ed18d72717bbf10938ffa76
Merge: da9ff3936d fcef8e3f75
Author: David Goulet 
Date:   Mon Sep 13 13:34:44 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 .gitlab-ci.yml | 9 -
 1 file 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.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-08-16 Thread dgoulet
commit da9ff3936d71a607a7af5b07f87d18a4aa303060
Merge: 18f2a7c012 a8ce645ab0
Author: David Goulet 
Date:   Mon Aug 16 16:34:19 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2021-08-16 Thread ahf
commit 78712990ab90b1317d164a1be806ef1d31d5da6d
Merge: b2d6fed3e9 b07cd2ee90
Author: Alexander Færøy 
Date:   Mon Aug 16 13:58:32 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5

 .gitlab-ci.yml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --cc .gitlab-ci.yml
index 8afd090a58,1e9d03caf5..f7abf8362e
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -96,10 -96,10 +96,10 @@@ variables
  - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
  - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi
  
 -# Minmal check on debian: just make, make check.
 +# Minimal check on debian: just make, make check.
  #
  debian-minimal:
-   image: debian:stable
+   image: debian:buster
<<: *debian-template
script:
  - ./scripts/ci/ci-driver.sh



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


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

2021-08-16 Thread nickm
commit 1667e122def480fac8033fb96057971969a446d5
Merge: ca249131b0 2984fba97a
Author: Nick Mathewson 
Date:   Mon Aug 16 08:18:09 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

"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/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-08-13 Thread dgoulet
commit ca249131b050fbd6ca7496f98abdeaa3cd5720f9
Merge: 685b3e4383 041a0a362f
Author: David Goulet 
Date:   Fri Aug 13 09:44:53 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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


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

2021-08-12 Thread dgoulet
commit 33abeeab9449efc19d064e032687e6c4dd9eca60
Merge: 81635ec577 eca5b62213
Author: David Goulet 
Date:   Thu Aug 12 12:13:25 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/geoip-2021-08-12 | 3 +
 src/config/geoip | 11954 +++--
 src/config/geoip6|  7433 +---
 3 files changed, 11890 insertions(+), 7500 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.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-08-11 Thread ahf
commit 81635ec5775ce9ca275ae19f40df0fe9bce4ea33
Merge: c48d1c3f7c 7e0971d868
Author: Alexander Færøy 
Date:   Wed Aug 11 13:15:58 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40447  |   2 +
 src/app/config/fallback_dirs.inc | 948 ---
 2 files changed, 482 insertions(+), 468 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.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-08-11 Thread ahf
commit c48d1c3f7c41c6d5c35aeda540fad013dbf83031
Merge: e7a8c3d127 fe5a9db1e6
Author: Alexander Færøy 
Date:   Wed Aug 11 13:14:26 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/bug40078   | 3 +++
 src/lib/crypt_ops/crypto_ed25519.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/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-08-11 Thread ahf
commit e7a8c3d1271fe8129eebec2eced8a42cb332608f
Merge: 70d8fb3eab 399518da02
Author: Alexander Færøy 
Date:   Wed Aug 11 13:06:12 2021 +

Merge branch 'maint-0.3.5' into maint-0.4.5




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