aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'public/bug10849_025'Nick Mathewson2014-05-01
|\
| * Remove TunnelDirConns and PreferTunnelledDirConnsNick Mathewson2014-02-11
* | Quench gcc's complaints about discarding constness in TO_ORIGIN_CIRCUIT.dana koch2014-04-29
* | Merge branch 'bug11396_v2_squashed'Nick Mathewson2014-04-24
|\ \
| * | Change the logic for the default for MaxMemInQueuesNick Mathewson2014-04-24
* | | Merge branch '10267_plus_10896_rebased_twice'Nick Mathewson2014-04-16
|\ \ \
| * | | Educate tor on OpenBSD's use of divert-to rules with the pf firewall.dana koch2014-04-16
| * | | ipfw TransPort support on FreeBSD (10267)Nick Mathewson2014-04-16
| |/ /
* | | Merge remote-tracking branch 'public/bug10431'Nick Mathewson2014-04-09
|\ \ \
| * | | Report only the first bootstrap failure from an orconnNick Mathewson2014-03-27
| |/ /
* | | Merge remote-tracking branch 'public/bug9841_025'Nick Mathewson2014-04-08
|\ \ \
| * \ \ Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025Nick Mathewson2014-02-13
| |\ \ \
| | * | | Faster circuit_get_by_rend_token_and_purpose()Nick Mathewson2014-02-13
* | | | | For missing transport, say "PT_MISSING" not "NO_ROUTE"Nick Mathewson2014-04-07
| |_|/ / |/| | |
* | | | Fix warnings from doxygenNick Mathewson2014-03-25
* | | | Take out remaining V1 directory code.Karsten Loesing2014-03-18
* | | | Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTimeNick Mathewson2014-03-05
* | | | Merge branch 'ticket9176_squashed'Nick Mathewson2014-03-05
|\ \ \ \
| * | | | Fix wide lines.Nick Mathewson2014-03-05
| * | | | Added max value to PredictedCircsRelevanceTime.unixninja922014-03-05
| * | | | PredictedCircsRelevanceTime: limit how long we predict a port will be usedunixninja922014-03-05
* | | | | Merge remote-tracking branch 'arma/ticket5528'Nick Mathewson2014-03-05
|\ \ \ \ \
| * | | | | stop setting, or using, router->addressRoger Dingledine2013-02-09
* | | | | | Include v3 in documented 'protocols' in rend_service_descriptor_tNick Mathewson2014-03-04
* | | | | | 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
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Rename MaxMemInCellQueues to MaxMemInQueuesNick Mathewson2013-11-20
| | | * | | | Have the OOM handler also count the age the data in a stream bufferNick Mathewson2013-11-15
* | | | | | | Remove remaining v0 hidden service descriptor code.Karsten Loesing2014-02-12
|/ / / / / /
* | | | | | Merge remote-tracking branch 'public/no_itime_queue_025'Nick Mathewson2014-02-11
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'public/no_itime_queue'Nick Mathewson2014-02-10
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Excise the insertion_time_elem_t logicNick Mathewson2014-02-10
| | |/ / / /
* | / / / / 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
* | | | | | Add support for TPROXY via new TransTPRoxy optionNick Mathewson2014-01-31
|/ / / / /
* | | | | Merge branch 'finish_prop157'Nick Mathewson2013-11-18
|\ \ \ \ \
| * | | | | Make the dir-key-crosscert element requiredNick Mathewson2013-11-14
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-11-15
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-11-15
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Improved circuit queue out-of-memory handlerNick Mathewson2013-11-07
| | * | | Send NETINFO on receiving a NETINFO if we have not yet sent one.Nick Mathewson2013-08-21
* | | | | Merge branch 'prop221_squashed_024'Nick Mathewson2013-11-01
|\ \ \ \ \
| * | | | | circuit_build_failed: distinguish "got DESTROY" caseNick Mathewson2013-11-01
| |/ / / /
* | | | | Merge branch 'morestats4' into morestats5Karsten Loesing2013-10-28
|\ \ \ \ \
| * | | | | Tweak CIRC_BW event based on comments by nickm.Karsten Loesing2013-05-25
| * | | | | Tweak TB_EMPTY event based on comments by nickm.Karsten Loesing2013-05-25