[tor-commits] [tor/master] Merge branch 'tor-github/pr/1962' into maint-0.4.4

[asn at torproject.org]

commit 05ca50c9a3d7a7b3c6d8684d9743333f65bfabd7
Merge: 18fa53fdf 6ff459675
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Jul 3 15:54:24 2020 +0300

    Merge branch 'tor-github/pr/1962' into maint-0.4.4

 changes/ticket40003            |  3 +++
 src/feature/rend/rendservice.c | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --cc src/feature/rend/rendservice.c
index a88c2080f,eaf0432a7..83388a72e
--- a/src/feature/rend/rendservice.c
+++ b/src/feature/rend/rendservice.c
@@@ -725,12 -739,17 +741,15 @@@ rend_config_service(const hs_opts_t *hs
                      const or_options_t *options,
                      hs_service_config_t *config)
  {
 -  const config_line_t *line;
    rend_service_t *service = NULL;
  
 -  /* line_ can be NULL which would mean that the service configuration only
 -   * have one line that is the directory directive. */
    tor_assert(options);
 +  tor_assert(hs_opts);
    tor_assert(config);
  
+   /* We are about to configure a version 2 service. Warn of deprecation. */
+   WARN_ONCE_DEPRECATION();
+ 
    /* Use the staging service list so that we can check then do the pruning
     * process using the main list at the end. */
    if (rend_service_staging_list == NULL) {