aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Expand)AuthorAge
* Fix whitespace in patch for 2210 and backport to 0.2.2Nick Mathewson2010-11-29
* Improve fairness when activating streams in circuit_resume_edge_reading_helperMashael AlSabah2010-11-29
* Merge branch 'exitstats' into maint-0.2.2Nick Mathewson2010-11-29
|\
| * comment karsten's bug2196 patch a littleNick Mathewson2010-11-29
| * Report only the top 10 ports in exit-port stats.Karsten Loesing2010-11-24
* | Avoid dereferencing NULL if a bridge fails to build an ei descriptor.Robert Ransom2010-11-24
|/
*-. Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2Nick Mathewson2010-11-19
|\ \
| | * Fix logic error in router_dump_router_to_string.Robert Ransom2010-11-19
| | * Generate a router descriptor even if generating an extra-info descriptor fails.Robert Ransom2010-11-17
| | * Do not emit an extra-info-digest descriptor line if the digest is zero.Robert Ransom2010-11-17
| * | Add comments to some of the bug2183 fix codeNick Mathewson2010-11-19
| * | Tweak the bugfix for 2183 a bit more.Karsten Loesing2010-11-17
| * | Don't use log_err for non-criticial warnings.Karsten Loesing2010-11-15
| * | Try harder not to exceed the 50 KB extra-info descriptor limit.Karsten Loesing2010-11-15
| |/
* | warn more about AllowSingleHopExitsRoger Dingledine2010-11-16
* | Merge commit 'nickm/1776_redux_v1' into maint-0.2.2Roger Dingledine2010-11-15
|\ \
| * | Clean up my 1776 fix a bitNick Mathewson2010-11-15
| * | Bulletproof the routerlist manipulation functions to handle reinserting the s...Nick Mathewson2010-11-10
| * | Fix the assert in bug 1776Nick Mathewson2010-11-02
* | | Move controller event for socks warning into log_unsafe_socks_warningNick Mathewson2010-11-15
* | | Merge branch 'bug2000_nm_022' into maint-0.2.2Nick Mathewson2010-11-15
|\ \ \
| * | | Rate-limit unsafe socks warningSebastian Hahn2010-11-15
| | |/ | |/|
* | | Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2Nick Mathewson2010-11-15
|\ \ \ | |/ / |/| |
| * | Break NoPublish supportSebastian Hahn2010-11-10
| * | Change Natd into NATD in our options.Sebastian Hahn2010-11-10
| * | Synx manpage and source wrt option capitalizationSebastian Hahn2010-11-10
| * | Comment out the (unused) RunTesting optionSebastian Hahn2010-11-10
* | | Avoid perma-blocking the controller on bug in shrink_freelistNick Mathewson2010-11-12
* | | Disable logging to control port connections in buf_shrink_freelists.Robert Ransom2010-11-12
* | | Move the original log_info call out of the core of buf_shrink_freelists.Robert Ransom2010-11-12
* | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2010-11-11
|\ \ \
| * | | let unpublished bridges learn their ip address tooRoger Dingledine2010-11-11
* | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2010-11-10
|\| | | | |/ / |/| |
| * | Enforce multiplicity rules when parsing annotations.Nick Mathewson2010-11-10
| * | Fix a bug where seting allow_annotations==0 only ignores annotations, but doe...Nick Mathewson2010-11-10
* | | Remove delay to become HSDir in privnetsSebastian Hahn2010-10-26
| |/ |/|
* | Properly refcount client_identity_keySebastian Hahn2010-10-26
* | Fix a whitespace errorNick Mathewson2010-10-21
* | Merge branch 'bug988-nm' into maint-0.2.2Nick Mathewson2010-10-21
|\ \
| * | Add some asserts to get_{tlsclient|server}_identity_keyNick Mathewson2010-10-21
| * | Rename get_client_identity_key to get_tlsclient_identity_keyNick Mathewson2010-10-21
| * | Maintain separate server and client identity keys when appropriate.Robert Ransom2010-10-04
| * | Maintain separate server and client TLS contexts.Robert Ransom2010-10-04
| * | Refactor tor_tls_context_new:Robert Ransom2010-10-04
| * | Add public_server_mode function.Robert Ransom2010-10-04
* | | Fix a remaining bug in Robert's bug1859 fix.Nick Mathewson2010-10-21
* | | Merge remote branch 'hoganrobert/bug1859' into maint-0.2.2Nick Mathewson2010-10-21
|\ \ \
| * | | Issues with router_get_by_nickname()Robert Hogan2010-10-17
| * | | Issues with router_get_by_nickname()Robert Hogan2010-10-13
* | | | Merge remote branch 'sebastian/relay_early_rend' into maint-0.2.2Nick Mathewson2010-10-21
|\ \ \ \