aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'karsten/task-11070'Nick Mathewson2014-03-23
|\
| * Take out remaining V1 directory code.Karsten Loesing2014-03-18
* | Appease make check-spacesAndrea Shepard2014-03-18
|/
* Tone down the log message for when we don't need a PT proxy.George Kadianakis2014-03-10
* Merge branch 'bug11043_take2_squashed'Nick Mathewson2014-03-10
|\
| * Improve the log message for when the Extended ORPort is not enabled.George Kadianakis2014-03-10
* | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-03-06
|\ \
| * | Correct the URL in the "a relay on win95???" messageNick Mathewson2014-03-06
* | | Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTimeNick Mathewson2014-03-05
* | | Merge branch 'ticket9176_squashed'Nick Mathewson2014-03-05
|\ \ \
| * | | Lower the maximum for PrecictedCircsRelevanceTime to one hourNick Mathewson2014-03-05
| * | | Fixed spacing.unixninja922014-03-05
| * | | Added max value to PredictedCircsRelevanceTime.unixninja922014-03-05
| * | | PredictedCircsRelevanceTime: limit how long we predict a port will be usedunixninja922014-03-05
* | | | Merge branch 'bug10169_025_v2'Nick Mathewson2014-03-04
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2Nick Mathewson2014-02-12
| |\ \ \
| | * \ \ Merge remote-tracking branch 'public/bug10169_023' into bug10169_024Nick Mathewson2014-01-03
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Drop the MaxMemInQueues lower limit down to 256 MB.Nick Mathewson2013-11-20
| | | * | Rename MaxMemInCellQueues to MaxMemInQueuesNick Mathewson2013-11-20
* | | | | Merge remote-tracking branch 'karsten/task-5824'Nick Mathewson2014-02-28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Disable (Cell,Entry,ExitPort)Statistics on bridgesKarsten Loesing2013-12-18
* | | | | Remove options for configuring HS authorities.Nick Mathewson2014-02-10
* | | | | TransProxyType replaces TransTPROXY optionNick Mathewson2014-02-03
* | | | | More fixes to rip out all of the v2 directory code.Karsten Loesing2014-02-03
* | | | | Merge remote-tracking branch 'public/bug10758'Nick Mathewson2014-02-03
|\ \ \ \ \
| * | | | | Rip out all of the v2 directory code.Nick Mathewson2014-01-29
| |/ / / /
* | | | | Move the friendly warning about TPROXY and root to EPERM timeNick Mathewson2014-02-02
* | | | | Add support for TPROXY via new TransTPRoxy optionNick Mathewson2014-01-31
|/ / / /
* | | | Merge branch 'backtrace_squashed'Nick Mathewson2013-11-18
|\ \ \ \
| * | | | Unit tests for new functions in log.cNick Mathewson2013-11-18
| * | | | Add a sighandler-safe logging mechanismNick Mathewson2013-11-18
| * | | | Basic backtrace abilityNick Mathewson2013-11-18
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-11-10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix a wide lineNick Mathewson2013-11-10
| * | | | Change documentation DirServer->DirAuthorityNick Mathewson2013-11-10
* | | | | Implementing --allow-missing-torrc CLI option.rl19872013-11-07
* | | | | Merge branch 'prop221_squashed_024'Nick Mathewson2013-11-01
|\ \ \ \ \
| * | | | | Implement proposal 221: Stop sending CREATE_FASTNick Mathewson2013-11-01
| |/ / / /
* | | | | Merge remote-tracking branch 'karsten/morestats5'Nick Mathewson2013-10-30
|\ \ \ \ \
| * \ \ \ \ Merge branch 'morestats4' into morestats5Karsten Loesing2013-10-28
| |\ \ \ \ \
| | * | | | | Tweak TB_EMPTY event based on comments by nickm.Karsten Loesing2013-05-25
| | * | | | | Tweak CELL_STATS event based on comments by nickm.Karsten Loesing2013-05-25
| | * | | | | Tweak CONN_BW event based on comments by nickm.Karsten Loesing2013-05-25
* | | | | | | Merge remote-tracking branch 'public/bug5018'Nick Mathewson2013-10-29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Document that unneeded transports are ignored.David Fifield2013-10-29
| * | | | | | Only launch transport proxies that provide useful transports.George Kadianakis2013-10-29
| | |/ / / / | |/| | | |
* | | | | | Merge remote-tracking branch 'Ryman/bug5605'Nick Mathewson2013-10-25
|\ \ \ \ \ \
| * | | | | | No longer writing control ports to file if updating reversible options fail. ...Kevin Butler2013-09-02
* | | | | | | Merge remote-tracking branch 'linus/bug9206_option'Nick Mathewson2013-10-16
|\ \ \ \ \ \ \
| * | | | | | | Add TestingDirAuthVoteGuard option for specifying relays to vote Guard on.Linus Nordberg2013-10-07