summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-22Merge remote-tracking branch 'tor-github/pr/1417'Nick Mathewson
2019-10-22Merge branch 'bug32175'Nick Mathewson
2019-10-22Merge branch 'from_setconf_removal_squashed'Nick Mathewson
2019-10-22changes file for 31999Nick Mathewson
2019-10-22Extract log-granularity code into its own function.Nick Mathewson
2019-10-22Add tests for options_init_logs()Nick Mathewson
2019-10-22Make a pair of add_*_log() functions mockable.Nick Mathewson
2019-10-22Make options_init_logs STATIC for testing.Nick Mathewson
2019-10-22Update tests to handle new interpretation of quiet_level.Nick Mathewson
2019-10-22Rationalize handling of quiet_level in config.cNick Mathewson
2019-10-22Merge branch 'maint-0.4.2'teor
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-10-22Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-22Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5teor
2019-10-22Merge branch 'ticket32177_041' into ticket32177_042teor
2019-10-22Merge branch 'ticket32177_040' into ticket32177_041teor
2019-10-22Merge branch 'ticket32177_035' into ticket32177_040teor
2019-10-22Merge branch 'maint-0.3.5' into ticket32177_035teor
2019-10-22Travis: Disable the Rust macOS buildteor
2019-10-22Merge branch 'ticket32177_029' into ticket32177_035teor
2019-10-22Travis: Disable all but one macOS buildteor
2019-10-21Merge remote-tracking branch 'tor-github/pr/1420'Nick Mathewson
2019-10-21Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-10-21Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-21Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-21Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-21Fix a memory leak introduced by the changes to test_options.cNick Mathewson
2019-10-21Fix a memory leak introduced by changes to test_options.cNick Mathewson
2019-10-21Fix up some Windows CI issues.Nick Mathewson
2019-10-21Changes file for 32175 (test_options.c cleanup)Nick Mathewson
2019-10-21test_options.c: Remove TEST_OPTIONS_DEFAULT_VALUESNick Mathewson
2019-10-21Stop overriding ConnLimit in tests.Nick Mathewson
2019-10-21test_options.c: remove weird usage of ConnLimitNick Mathewson
2019-10-21Stop overriding MaxClientCircuitsPending in tests.Nick Mathewson
2019-10-21test_options.c: remove weird usage of MaxClientCircuitsPendingNick Mathewson
2019-10-21Stop overriding KeepalivePeriod in tests.Nick Mathewson
2019-10-21test_options.c: remove weird usage of KeepalivePeriod.Nick Mathewson
2019-10-21Remove a lot of cruft from TEST_OPTIONS_DEFAULT_VALUES.Nick Mathewson
2019-10-21test_options: use testing options with (almost) real defaults.Nick Mathewson
2019-10-21routermode.h: turn a comment into a doxygen comment.Nick Mathewson
2019-10-21Merge remote-tracking branch 'tor-github/pr/1430'Nick Mathewson
2019-10-21Merge remote-tracking branch 'tor-github/pr/1434'teor
2019-10-21test/getinfo: Remove unnecessary test codeteor
2019-10-21control/getinfo: Use standard error handlingteor
2019-10-21Fix changes file and string typosteor
2019-10-21control: Add GETINFO support for dumping microdesc consensusAmreshVenugopal
2019-10-21Merge branch 'maint-0.4.2'teor
2019-10-21Merge remote-tracking branch 'tor-github/pr/1168'teor
2019-10-21Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2teor