aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-07-31
|\
| * NumDirectoryGuards now tracks NumEntryGuards by defaultRoger Dingledine2013-07-30
* | Use TOR_SIMPLEQ for packed_cell_tNick Mathewson2013-07-18
* | Write function that parses ServerTransportOptions torrc lines.George Kadianakis2013-07-18
* | cosmetic cleanupsRoger Dingledine2013-07-14
* | Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'Nick Mathewson2013-07-12
|\ \
| * | Add a basic seccomp2 syscall filter on LinuxCristian Toader2013-07-11
* | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-18
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-18
| |\ \
| | * | Implement a real OOM-killer for too-long circuit queues.Nick Mathewson2013-06-18
| | * | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| | * | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
| * | | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| * | | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
* | | | Merge branch 'circuit_queue_cap-0.2.5-squashed'Nick Mathewson2013-06-14
|\ \ \ \
| * | | | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| * | | | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'linus/bug8532'Nick Mathewson2013-06-13
|\ \ \ \
| * | | | Add support for offsetting the voting interval in order to bootstrap faster.Linus Nordberg2013-06-08
| |/ / /
* | | | Merge remote-tracking branch 'public/bug7912_squashed'Nick Mathewson2013-06-13
|\ \ \ \ | |/ / / |/| | |
| * | | Code to track on a circuit whether it has a "pending" delete cellNick Mathewson2013-06-13
* | | | Merge remote-tracking branch 'karsten/task-6752-3'Nick Mathewson2013-05-28
|\ \ \ \
| * | | | Lower dir fetch retry schedules in testing networks.Karsten Loesing2013-05-16
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-05-20
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Copy-paste description of PathBias params from man page to or.h commentAndrea Shepard2013-05-20
* | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-04-18
|\| | |
| * | | Merge branch 'less_charbuf_rebased' into maint-0.2.4Nick Mathewson2013-04-18
| |\ \ \
| | * | | Test improvement: include microdesc lines in our synthetic microdesc consensu...Nick Mathewson2013-04-18
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-04-14
|\| | | |
| * | | | Merge branch 'bug8683_rebased' into maint-0.2.4Nick Mathewson2013-04-14
| |\ \ \ \
| | * | | | Rename all fields which measure bw in kb to end with _kbNick Mathewson2013-04-14
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-04-12
|\| | | | |
| * | | | | Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4Nick Mathewson2013-04-12
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Avoid busy-looping on WANTREAD within connection_handle_writeNick Mathewson2013-04-12
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-04-11
|\| | | |
| * | | | Merge remote-tracking branch 'public/bug8117_023' into maint-0.2.4Nick Mathewson2013-04-11
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Per-SOCKSPort configuration for bug 8117 fix.Nick Mathewson2013-03-20
| | |/ /
* | | | Removed obsolete code related to cached-routersAkshay Hebbar Y S2013-04-01
* | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-03-20
|\| | |
| * | | Set default minimum bandwidth for exit flag to zero for TestingTorNetworkAndrea Shepard2013-03-20
| * | | Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAGNick Mathewson2013-03-20
* | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-03-19
|\| | |
| * | | Merge branch 'bug8240_v2_squashed' into maint-0.2.4Nick Mathewson2013-03-19
| |\ \ \
| | * | | Make the guard lifetime configurable and adjustable via the consensusNick Mathewson2013-03-19
| | |/ /
* | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-03-19
|\| | |
| * | | Merge branch 'bug7582_v2' into maint-0.2.4Nick Mathewson2013-03-19
| |\ \ \
| | * | | On END_REASON_EXITPOLICY, mark circuit as unusable for that address.Nick Mathewson2013-03-11
* | | | | Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'Nick Mathewson2013-03-19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Send SOCKS arguments when doing SOCKS4.George Kadianakis2013-02-09
* | | | | Merge remote-tracking branch 'public/bug6174' into maint-0.2.4Nick Mathewson2013-03-18
|\ \ \ \ \