diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-03-16 18:10:24 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-03-16 18:10:24 -0400 |
commit | 1db6eb6cb7db46d8dde482f629fbc1c578310d52 (patch) | |
tree | b8913134d76ef66246b140b478a5651680873580 /src/or/config.c | |
parent | b1b6552251c87db6c4fd226add8ae8bdb9327981 (diff) | |
parent | 9dfa244484ff9c52d545daa620e034b4d03f969c (diff) | |
download | tor-1db6eb6cb7db46d8dde482f629fbc1c578310d52.tar.gz tor-1db6eb6cb7db46d8dde482f629fbc1c578310d52.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
-rw-r--r-- | src/or/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index 79d222b38f..d853d7b7d0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4874,10 +4874,10 @@ options_save_current(void) } /** Mapping from a unit name to a multiplier for converting that unit into a - * base unit. */ + * base unit. Used by config_parse_unit. */ struct unit_table_t { - const char *unit; - uint64_t multiplier; + const char *unit; /**< The name of the unit */ + uint64_t multiplier; /**< How many of the base unit appear in this unit */ }; /** Table to map the names of memory units to the number of bytes they |