Merge branch 'master' into topic/tunnels

This commit is contained in:
Jon Siwek 2012-05-22 16:05:06 -05:00
commit 0d7d74e11b
155 changed files with 3502 additions and 1040 deletions

View file

@ -167,6 +167,7 @@ extern double connection_status_update_interval;
extern StringVal* state_dir;
extern double state_write_delay;
extern int max_files_in_cache;
extern double log_rotate_interval;
extern double log_max_size;
extern RecordType* rotate_info;