aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-18
|\
| * Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cellsNick Mathewson2013-06-18
| * Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-18
| |\
| | * Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3Nick Mathewson2013-06-18
| | |\
| | | * Implement a real OOM-killer for too-long circuit queues.Nick Mathewson2013-06-18
| | * | Limit hidden service descriptors to at most 10 guard nodes.Nick Mathewson2013-06-16
| | |/
* | | Merge remote-tracking branch 'public/bug9082'Nick Mathewson2013-06-17
|\ \ \
| * | | Fix bug 9082: avoid leak when freeing destroy cell queuesNick Mathewson2013-06-17
* | | | Merge branch 'bug9072-024' into bug9072-025Andrea Shepard2013-06-15
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'bug9072-023' into bug9072-024Andrea Shepard2013-06-15
| |\ \ \ | | | |/ | | |/|
| | * | Disable middle relay queue overfill detection code due to possible guard disc...Andrea Shepard2013-06-15
| | * | 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
|\ \ \ \
| * | | | Fix signed/unsigned comparison warningNick 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 'origin/maint-0.2.4'Nick Mathewson2013-06-13
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | If we write the annotation but not the microdescriptor, rewind.Nick Mathewson2013-06-13
* | | | | Rename networkstatus_dl_interval() -> networkstatus_dl_check_interval()Nick Mathewson2013-06-13
* | | | | Merge remote-tracking branch 'linus/bug8532'Nick Mathewson2013-06-13
|\ \ \ \ \
| * | | | | Hide consensus download interval, depending on TestingTorNetwork, in a macro.Linus Nordberg2013-06-10
| * | | | | 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
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix compile warnings wrt printf formating of int64_tNick Mathewson2013-06-13
| * | | | | Add destroy balance tracking and logging to circuitmuxAndrea Shepard2013-06-13
| * | | | | Implementation of a fix for bug 7912Nick Mathewson2013-06-13
| * | | | | Code to track on a circuit whether it has a "pending" delete cellNick Mathewson2013-06-13
| * | | | | Implement a placeholder mechanism in the channel,id->circ mapNick Mathewson2013-03-21
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-13
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'public/bug8822' into maint-0.2.4Nick Mathewson2013-06-13
| |\ \ \ \ \
| | * | | | | Make all consumers of microdesc_t.body tolerate NULLNick Mathewson2013-06-12
| | * | | | | Unmap the microdescriptor cache before replacing it.Nick Mathewson2013-06-12
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\| | | | | | | |_|_|_|/ / |/| | | | |
| * | | | | Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4Nick Mathewson2013-06-12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | When launching a resolve request on behalf of an AF_UNIX control, omit the ad...Andrea Shepard2013-05-31
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-10
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-10
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Fix (Open?)BSD fast-connect bug with optimistic data.Nick Mathewson2013-06-10
* | | | Start correctly when not in testing mode.Nick Mathewson2013-05-28
* | | | Merge remote-tracking branch 'karsten/task-6752-3'Nick Mathewson2013-05-28
|\ \ \ \
| * | | | Try harder to document default_options correctly.Karsten Loesing2013-05-25
| * | | | Tweak #6752 patch based on comments by nickm.Karsten Loesing2013-05-24
| * | | | Lower dir fetch retry schedules in testing networks.Karsten Loesing2013-05-16
* | | | | Reformat 4282 fixes a littleNick Mathewson2013-05-24
* | | | | Fix a logic error in 4282 fixesNick Mathewson2013-05-24
* | | | | Extract duplicate code in geoip and rephist.Peter Retzlaff2013-05-24
* | | | | Tweak fix for #8789 a bit; avoid double-close and add changes fileNick Mathewson2013-05-24