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/directory.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/directory.c')
| -rw-r--r-- | src/or/directory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 77f8f310b1..d8492cbbec 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -349,7 +349,7 @@ should_use_directory_guards(const or_options_t *options) return 1; } -/** Pick an unconsetrained directory server from among our guards, the latest +/** Pick an unconstrained directory server from among our guards, the latest * networkstatus, or the fallback dirservers, for use in downloading * information of type <b>type</b>, and return its routerstatus. */ static const routerstatus_t * |