commit b0a7e0d6ca45bef3c5836d9082dcc9461cee6c9c Merge: 9d67d16 4010427 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 28 20:55:03 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) diff --cc src/or/config.h index 7f0a3d1,78a67dd..49f7e25 --- a/src/or/config.h +++ b/src/or/config.h @@@ -57,9 -57,8 +57,10 @@@ char *options_get_datadir_fname2_suffix #define get_datadir_fname_suffix(sub1, suffix) \ get_datadir_fname2_suffix((sub1), NULL, (suffix)) +int get_num_cpus(const or_options_t *options); + or_state_t *get_or_state(void); + int did_last_state_file_write_fail(void); int or_state_save(time_t now); int options_need_geoip_info(or_options_t *options, const char **reason_out);