diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-07 12:17:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-07 12:17:20 -0400 |
| commit | 67d88a7d6021e95a2d423a9f26811accd1da39b6 (patch) | |
| tree | 30d48f5f922b928f7727ed812905101e5bf24012 /src/or/rephist.c | |
| parent | 07ab483e62457ee56187037304f25ec50cb0850a (diff) | |
| parent | ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3 (diff) | |
| download | tor-67d88a7d6021e95a2d423a9f26811accd1da39b6.tar.gz tor-67d88a7d6021e95a2d423a9f26811accd1da39b6.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/address.c
src/common/compat_libevent.c
src/common/memarea.c
src/common/util.h
src/or/buffers.c
src/or/circuitbuild.c
src/or/circuituse.c
src/or/connection.c
src/or/directory.c
src/or/networkstatus.c
src/or/or.h
src/or/routerlist.c
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index 688ff82ee4..56a3d1de28 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -588,7 +588,7 @@ rep_hist_get_weighted_time_known(const char *id, time_t when) int rep_hist_have_measured_enough_stability(void) { - /* XXXX021 This doesn't do so well when we change our opinion + /* XXXX022 This doesn't do so well when we change our opinion * as to whether we're tracking router stability. */ return started_tracking_stability < time(NULL) - 4*60*60; } |