diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-30 14:55:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-30 14:55:50 -0400 |
| commit | ee871e7a0e9ce9b1df8b8f4add06e8c193b9544a (patch) | |
| tree | c791e7b6b48b44fa2df56727cd9c80261a892615 /src/or/circuituse.h | |
| parent | 18126f92a74e9e1d81f9abf02bda2f5458c32bc6 (diff) | |
| parent | 65eb0e41ac05fd65bf8bef87426886fec45f7ca4 (diff) | |
| download | tor-ee871e7a0e9ce9b1df8b8f4add06e8c193b9544a.tar tor-ee871e7a0e9ce9b1df8b8f4add06e8c193b9544a.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/compat.h
src/or/circuitlist.c
src/or/circuituse.c
src/or/or.h
src/or/rephist.c
Diffstat (limited to 'src/or/circuituse.h')
| -rw-r--r-- | src/or/circuituse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.h b/src/or/circuituse.h index 9f0e9d575..c81d6da23 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -12,7 +12,7 @@ #ifndef _TOR_CIRCUITUSE_H #define _TOR_CIRCUITUSE_H -void circuit_expire_building(time_t now); +void circuit_expire_building(void); void circuit_remove_handled_ports(smartlist_t *needed_ports); int circuit_stream_is_being_handled(edge_connection_t *conn, uint16_t port, int min); |