Merge branch 'misc' into 'main'

Fix a couple of minor issues

See merge request tpo/core/arti!1003

crates/tor-netdir/src/lib.rs

@@ -606,7 +606,7 @@ impl PartialNetDir {
             }
         }
 
-        #[cfg(feature = "hs-common")]
+        #[cfg(feature = "onion-common")]
         {
             // TODO hs: cache the values for the hash rings if possible, maybe
             // in the PartialNetDir, since we will want to use them in computing
@@ -619,7 +619,7 @@ impl PartialNetDir {
     }
 
     /// Compute the hash ring(s) for this NetDir, if one is not already computed.
-    #[cfg(feature = "hs-common")]
+    #[cfg(feature = "onion-common")]
     #[allow(clippy::missing_panics_doc)]
     pub fn compute_ring(&mut self) {
         // TODO hs: compute the ring based on the time period and shared random

crates/tor-netdoc/src/parse/tokenize.rs

@@ -22,6 +22,7 @@ pub(crate) mod object {
     /// indicates the end of a begin or end tag.
     pub(crate) const TAG_END: &str = "-----";
     /// Maximum PEM base64 line length (not enforced during parsing)
+    #[cfg(feature = "onion-service")]
     pub(crate) const BASE64_PEM_MAX_LINE: usize = 64;
 }