aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-12 21:42:45 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-12 21:42:45 -0400
commit0820031419efcd39c2fddfa5efebbaa779982620 (patch)
tree1f63dd5e04ea6dd70eb21b8fd251ee7172d4083f
parenta7904543689917d0087ea47ad3d3c1631cdd2bde (diff)
parent1ec4d52e593035aee0d59016c8c8dec6a4561b00 (diff)
downloadtor-0820031419efcd39c2fddfa5efebbaa779982620.tar.gz
tor-0820031419efcd39c2fddfa5efebbaa779982620.zip
Merge remote-tracking branch 'asn/bug11486'
-rw-r--r--src/test/test_config.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 3a1e6cb78a..dbb50798b8 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -421,6 +421,23 @@ test_config_parse_bridge_line(void *arg)
smartlist_free(sl_tmp);
}
+ {
+ smartlist_t *sl_tmp = smartlist_new();
+ smartlist_add_asprintf(sl_tmp, "dub=come");
+ smartlist_add_asprintf(sl_tmp, "save=me");
+
+ good_bridge_line_test("transport 192.0.2.1:12 "
+ "4352e58420e68f5e40bf7c74faddccd9d1349666 "
+ "dub=come save=me",
+
+ "192.0.2.1:12",
+ "4352e58420e68f5e40bf7c74faddccd9d1349666",
+ "transport", sl_tmp);
+
+ SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
+ smartlist_free(sl_tmp);
+ }
+
good_bridge_line_test("192.0.2.1:1231 "
"4352e58420e68f5e40bf7c74faddccd9d1349413",
"192.0.2.1:1231",