summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-06 14:15:08 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-06 14:15:08 -0500
commita034863b45455a2def6d957d54bec2530db4a1a6 (patch)
treefd3ac9af55713244202a1bcb06c5f5a73bc16e40 /src/or/config.c
parentfcc78e5f8a3249eadfea31db1aca6884b31c1873 (diff)
parent8ef6cdc39f047a7579858a6e23629c1c2718fc0a (diff)
downloadtor-a034863b45455a2def6d957d54bec2530db4a1a6.tar.gz
tor-a034863b45455a2def6d957d54bec2530db4a1a6.zip
Merge remote-tracking branch 'public/bug12509_025'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 38f4981359..be0bfc7687 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3530,15 +3530,6 @@ options_validate(or_options_t *old_options, or_options_t *options,
AF_INET6, 1, msg)<0)
return -1;
- if (options->AutomapHostsSuffixes) {
- SMARTLIST_FOREACH(options->AutomapHostsSuffixes, char *, suf,
- {
- size_t len = strlen(suf);
- if (len && suf[len-1] == '.')
- suf[len-1] = '\0';
- });
- }
-
if (options->TestingTorNetwork &&
!(options->DirAuthorities ||
(options->AlternateDirAuthority &&