diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
| commit | c0391bae75e9eb71f5fa2ab24fc97792c204225d (patch) | |
| tree | 9701969423b86fdc2ba04080338d817c3b5c9864 /src/or/hibernate.c | |
| parent | 2cb59be9993ecec13ceabc0c4754e52f8c5ea4e5 (diff) | |
| parent | ec6c155f827000e337796f1f1c54299fbc5cf72a (diff) | |
| download | tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.tar tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.tar.gz | |
Merge remote-tracking branch 'public/fancy_test_tricks'
Conflicts:
src/common/include.am
Conflict was from adding testsupport.h near where sandbox.h had
already been added.
Diffstat (limited to 'src/or/hibernate.c')
| -rw-r--r-- | src/or/hibernate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/hibernate.c b/src/or/hibernate.c index a41257133..22c0f253d 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -1010,6 +1010,7 @@ getinfo_helper_accounting(control_connection_t *conn, return 0; } +#ifdef TOR_UNIT_TESTS /** * Manually change the hibernation state. Private; used only by the unit * tests. @@ -1019,4 +1020,5 @@ hibernate_set_state_for_testing_(hibernate_state_t newstate) { hibernate_state = newstate; } +#endif |