aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Expand)AuthorAge
* Add a simple integer-ceiling-division macro before we get it wrongNick Mathewson2010-09-14
* Merge branch 'bug1899'Nick Mathewson2010-09-14
|\
| * Extract the "do these routers have the same addr:orport" logic into a fnNick Mathewson2010-09-14
| * Launch reachability tests for routers whose IP or ORPort changeNick Mathewson2010-09-03
* | Merge branch 'bug911'Nick Mathewson2010-09-14
|\ \
| * | Tweak some issues found by arma in bug911 review.Nick Mathewson2010-09-14
| |/
| * Move code for launching tests out of router_add_to_routerlist()Nick Mathewson2010-08-18
| * Allow some skew in checking when a router said it was hibernatingNick Mathewson2010-08-18
| * Clarify AssumeReachable semantics wrt hibernationNick Mathewson2010-08-18
| * Add some braces to make arma happyNick Mathewson2010-08-18
| * If a router is hibernating, never vote that it is Running.Nick Mathewson2010-07-31
* | Merge remote branch 'sebastian/bug1776_v3'Nick Mathewson2010-09-14
|\ \
| * | Allow clients to use relays as bridgesSebastian Hahn2010-08-20
* | | Make circuit_resume_edge_reading_helper treat streams more fairly.Nick Mathewson2010-09-13
* | | Add a max_cells arg to connection_edge_process_raw_inbufNick Mathewson2010-09-13
* | | Fix function declaration linebreaks at start of relay.cNick Mathewson2010-09-13
* | | Merge remote branch 'public/pretty-signature-log'Nick Mathewson2010-09-13
|\ \ \
| * | | Complicate the rules on WARN vs INFO in consensus verificationNick Mathewson2010-09-02
| * | | Make the "2 unknown, 7 missing key..." messages easier to understandNick Mathewson2010-08-19
* | | | Merge remote branch 'sebastian/bug1525'Nick Mathewson2010-09-13
|\ \ \ \
| * | | | Update some documentation for the bug 1525 fixSebastian Hahn2010-08-08
| * | | | Ensure controller RESOLVE commands respect __LeaveStreamsUnattachedRobert Hogan2010-08-08
* | | | | Merge branch 'bug1138'Nick Mathewson2010-09-12
|\ \ \ \ \
| * | | | | Clean up a couple more bug1138 issues mentioned by roger on code reviewNick Mathewson2010-09-12
| * | | | | Handle null conn->requested_resource rather than assertRobert Hogan2010-09-12
| * | | | | Nick points out:Robert Hogan2010-09-02
| * | | | | Amend per Sebastian's comments:Robert Hogan2010-09-02
| * | | | | Fall back to direct descriptor request to bridges whenRobert Hogan2010-08-16
* | | | | | Make authorities download consensuses if appropriateNick Mathewson2010-09-12
* | | | | | fix regression introduced by 1a65bdd2Roger Dingledine2010-09-12
* | | | | | be more consistent in using streamid_tNick Mathewson2010-09-08
* | | | | | Merge branch 'bug1653'Nick Mathewson2010-09-08
|\ \ \ \ \ \
| * | | | | | Fix a missing stream_id argument; found by "tracktor"Nick Mathewson2010-09-03
| * | | | | | Fix behavior of adding a cell to a blocked queue.Nick Mathewson2010-09-02
| * | | | | | Detect if we try to put a cell onto a supposedly blocked cell queue.Nick Mathewson2010-08-18
| * | | | | | Decide whether to ignore SENDMEs based on streams_blocked, not queue sizeNick Mathewson2010-08-18
| * | | | | | Avoid over-filling cell queues when we receive a SENDMEyetonetime2010-08-18
* | | | | | | Merge remote branch 'origin/maint-0.2.1'Nick Mathewson2010-09-08
|\ \ \ \ \ \ \
| * | | | | | | Remove a needless keep_open_until_flushedNick Mathewson2010-09-08
| * | | | | | | Close a non-open OR connection *only* after KeepalivePeriod.Nick Mathewson2010-09-03
* | | | | | | | Merge remote branch 'public/win_unicode_fixes'Nick Mathewson2010-09-06
|\ \ \ \ \ \ \ \
| * | | | | | | | Make the windows build succeed with or without -DUNICODE enabled.Nick Mathewson2010-08-20
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'ratelim'Nick Mathewson2010-08-31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix some issues in rate-limiting noticed by SebastianNick Mathewson2010-08-31
| * | | | | | | | Add a generic rate-limited log mechanism, and use it in a few placesNick Mathewson2010-08-18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Fix a compile warning on OpenBSDSebastian Hahn2010-08-22
| |/ / / / / / |/| | | | | |
* | | | | | | Warn for bad combination of cookie optionsSebastian Hahn2010-08-20
* | | | | | | Fix up compilation on windows.Nick Mathewson2010-08-19
| |_|_|_|/ / |/| | | | |
* | | | | | delay geoip stats even more for relays-turned-bridgesRoger Dingledine2010-08-18
|/ / / / /
* | | | | Merge commit 'origin/maint-0.2.1'Nick Mathewson2010-08-18
|\| | | |