diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-23 09:36:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-23 09:36:00 -0500 |
| commit | 5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0 (patch) | |
| tree | b863aa88f8810c86e56f711fe1e032585f80e579 /src/test/test_nodelist.c | |
| parent | bd22ad12bd84019d00bcd92e2e2390cd910908ce (diff) | |
| parent | ac9b0a3110ea4eea63133c6d2e3572b2cfd22bd6 (diff) | |
| download | tor-5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0.tar.gz tor-5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0.zip | |
Merge remote-tracking branch 'public/ticket9969'
Conflicts:
src/or/directory.c
src/or/routerlist.c
src/or/routerlist.h
src/test/include.am
src/test/test.c
Diffstat (limited to 'src/test/test_nodelist.c')
| -rw-r--r-- | src/test/test_nodelist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index 9bd8b4a7ea..a8693ec9b5 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -10,7 +10,7 @@ #include "nodelist.h" #include "test.h" -/** Tese the case when node_get_by_id() returns NULL, +/** Test the case when node_get_by_id() returns NULL, * node_get_verbose_nickname_by_id should return the base 16 encoding * of the id. */ |