diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-08 10:09:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-08 10:09:17 -0400 |
| commit | bb68c731b897a967a4b7eb138728fa077617646e (patch) | |
| tree | 20d7c23762568756b01a6f698d09b7bee6dad808 /src/or/routerlist.c | |
| parent | 374611d9f6d1efd7ae6c3570104b284991519293 (diff) | |
| parent | fcac4b4467427e8f6ad948e8c8e6f34a0131e716 (diff) | |
| download | tor-bb68c731b897a967a4b7eb138728fa077617646e.tar.gz tor-bb68c731b897a967a4b7eb138728fa077617646e.zip | |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 5bad2b2e5c..9493c8094a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1367,7 +1367,7 @@ router_pick_trusteddirserver(dirinfo_type_t type, int flags) return router_pick_dirserver_generic(trusted_dir_servers, type, flags); } -/** Try to find a running fallback directory Flags are as for +/** Try to find a running fallback directory. Flags are as for * router_pick_directory_server. */ const routerstatus_t * @@ -1376,7 +1376,7 @@ router_pick_fallback_dirserver(dirinfo_type_t type, int flags) return router_pick_dirserver_generic(fallback_dir_servers, type, flags); } -/** Try to find a running fallback directory Flags are as for +/** Try to find a running fallback directory. Flags are as for * router_pick_directory_server. */ static const routerstatus_t * |