aboutsummaryrefslogtreecommitdiff
path: root/src/common/log.h
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2009-06-20 12:59:04 +0200
committerPeter Palfrader <peter@palfrader.org>2009-06-20 12:59:04 +0200
commite4ff67aa0aa9ab32b256a6e9b146e6e9565bb526 (patch)
tree9ab88648a5865fd2e54ca06154578de9720a9082 /src/common/log.h
parent6190c8145474d47e00805be9cf1f842437b2d53a (diff)
parentac3dedacce44b306ec1a9372ee54b0aabaeac8fe (diff)
downloadtor-e4ff67aa0aa9ab32b256a6e9b146e6e9565bb526.tar
tor-e4ff67aa0aa9ab32b256a6e9b146e6e9565bb526.tar.gz
Merge commit 'tor-0.2.1.16-rc' into debian-merge
* commit 'tor-0.2.1.16-rc': (31 commits) Bump version to 0.2.1.16-rc prepare changelog for 0.2.1.16-rc Better fix for 997. Revert "Backport fix for bug 997." tor-resolve: Don't automatically refuse .onion addresses. Backport fix for bug 997. Revise earlier check for correct IPv4 addr length to check for ==4. Check answer_len in the remap_addr case of process_relay_cell_not_open. update requirements to openssl 0.9.7 Missing changelog entry about geoip Move and fix a changelog entry. Noticed by optimist. Avoid a memory corruption problem related to "private" in DirPolicy. Update the rest of the geoip file. Update the geoip file Fix gprof bottlenecks on exit nodes found by Jacob. Do not report a node as a "chosen exit" when it is not in fact an exit. Make the second argument to routerset_contains_extendinfo const Don't attempt to log messages to a controller from a worker thread. Clean up a bit of C logic, and fix an erroneous warning. Consider *ListenAddress when warning about low ports and hibernation ...
Diffstat (limited to 'src/common/log.h')
-rw-r--r--src/common/log.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/log.h b/src/common/log.h
index c72fb6fb1..834b1724b 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -53,7 +53,7 @@
/** Catch-all for miscellaneous events and fatal errors. */
#define LD_GENERAL (1u<<0)
-/** The cryptography subsytem. */
+/** The cryptography subsystem. */
#define LD_CRYPTO (1u<<1)
/** Networking. */
#define LD_NET (1u<<2)