diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:07:13 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:07:13 -0400 |
commit | 92b4996b233a6a5d034b4ecc47b9f97985bb5886 (patch) | |
tree | a0f4f32423cbad9c4a2b8ccbc24f51b1c1b2c7ee /src/or | |
parent | f82f8179e65c5e0021da46fd24e4bd7d8126d8f7 (diff) | |
parent | 6e9d5fc4ec40136d173be680a85a9bfb9b99fea4 (diff) | |
download | tor-92b4996b233a6a5d034b4ecc47b9f97985bb5886.tar.gz tor-92b4996b233a6a5d034b4ecc47b9f97985bb5886.zip |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/hs_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/hs_client.c b/src/or/hs_client.c index d3978f22f0..636226a1d5 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -370,14 +370,12 @@ pick_hsdir_v3(const ed25519_public_key_t *onion_identity_pk) int retval; char base64_blinded_pubkey[ED25519_BASE64_LEN + 1]; uint64_t current_time_period = hs_get_time_period_num(0); - smartlist_t *responsible_hsdirs; + smartlist_t *responsible_hsdirs = NULL; ed25519_public_key_t blinded_pubkey; routerstatus_t *hsdir_rs = NULL; tor_assert(onion_identity_pk); - responsible_hsdirs = smartlist_new(); - /* Get blinded pubkey of hidden service */ hs_build_blinded_pubkey(onion_identity_pk, NULL, 0, current_time_period, &blinded_pubkey); @@ -388,6 +386,8 @@ pick_hsdir_v3(const ed25519_public_key_t *onion_identity_pk) } /* Get responsible hsdirs of service for this time period */ + responsible_hsdirs = smartlist_new(); + hs_get_responsible_hsdirs(&blinded_pubkey, current_time_period, 0, 1, responsible_hsdirs); |