From 59a7b00384a6e5fb905b064faed62c5b969ffebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= <ahf@torproject.org>
Date: Tue, 27 Feb 2018 22:57:30 +0100
Subject: [PATCH 1/2] Update tor.1.txt with the currently available log
 domains.

See: https://bugs.torproject.org/25378
---
 doc/tor.1.txt    | 3 ++-
 src/common/log.c | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index a8e5de7b5..9dbed2ef6 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -650,7 +650,8 @@ GENERAL OPTIONS
  +
     The currently recognized domains are: general, crypto, net, config, fs,
     protocol, mm, http, app, control, circ, rend, bug, dir, dirserv, or, edge,
-    acct, hist, and handshake.  Domain names are case-insensitive. +
+    acct, hist, handshake, heartbeat, channel, sched, guard, consdiff, and dos.
+    Domain names are case-insensitive. +
  +
     For example, "`Log [handshake]debug [~net,~mm]info notice stdout`" sends
     to stdout: all handshake messages of any severity, all info-and-higher
diff --git a/src/common/log.c b/src/common/log.c
index d59e5a403..9f4a8b2bc 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1258,7 +1258,10 @@ log_level_to_string(int level)
 }
 
 /** NULL-terminated array of names for log domains such that domain_list[dom]
- * is a description of <b>dom</b>. */
+ * is a description of <b>dom</b>.
+ *
+ * Remember to update doc/tor.1.txt if you modify this list.
+ * */
 static const char *domain_list[] = {
   "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM",
   "HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV",

From ccf0f77da1894a11502fa36767838f687a4494d9 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 3 Mar 2018 11:58:22 -0500
Subject: [PATCH 2/2] changes file for 25378

---
 changes/bug25378 | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changes/bug25378

diff --git a/changes/bug25378 b/changes/bug25378
new file mode 100644
index 000000000..4648a0a31
--- /dev/null
+++ b/changes/bug25378
@@ -0,0 +1,4 @@
+  o Documentation:
+    - Update the documentation for "Log" to include the current list
+      of logging domains. Closes ticket 25378.
+