summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2022-03-16 13:35:33 -0400
committerDavid Goulet <dgoulet@torproject.org>2022-03-16 13:35:33 -0400
commitf64a88e72d691cabc88544d7cb3f85c89573ed90 (patch)
tree855513072d37d43a22ef79f5759b7985ded4a378 /src/lib
parenta91bdca1a41960b3857847fd87ef0bbea4c6e45e (diff)
parent2905e7667e9e17d69ae1d23dbc970d1efe2d3d7e (diff)
downloadtor-f64a88e72d691cabc88544d7cb3f85c89573ed90.tar.gz
tor-f64a88e72d691cabc88544d7cb3f85c89573ed90.zip
Merge branch 'tor-gitlab/mr/490'
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/metrics/metrics_store.c2
-rw-r--r--src/lib/thread/compat_winthreads.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/metrics/metrics_store.c b/src/lib/metrics/metrics_store.c
index 33b1780438..b017e97688 100644
--- a/src/lib/metrics/metrics_store.c
+++ b/src/lib/metrics/metrics_store.c
@@ -60,7 +60,7 @@ get_output(const metrics_store_t *store, buf_t *data, fmt_driver_fn_t fmt)
tor_assert(fmt);
STRMAP_FOREACH(store->entries, key, const smartlist_t *, entries) {
- /* Indicate that we've formatted the coment already for the entries. */
+ /* Indicate that we've formatted the comment already for the entries. */
bool comment_formatted = false;
SMARTLIST_FOREACH_BEGIN(entries, const metrics_store_entry_t *, entry) {
fmt(entry, data, comment_formatted);
diff --git a/src/lib/thread/compat_winthreads.c b/src/lib/thread/compat_winthreads.c
index e25fb52e39..f28cdcca00 100644
--- a/src/lib/thread/compat_winthreads.c
+++ b/src/lib/thread/compat_winthreads.c
@@ -146,7 +146,7 @@ tor_cond_wait(tor_cond_t *cond, tor_mutex_t *lock_, const struct timeval *tv)
{
// recursive SRW locks are not supported because they need extra logic for
// acquiring and releasing but SleepConditionVariableSRW will use the OS
- // lock relase function which lacks our extra logic
+ // lock release function which lacks our extra logic
tor_assert(lock_->type == NON_RECURSIVE);
SRWLOCK *lock = &lock_->mutex;
DWORD ms = INFINITE;