aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Expand)AuthorAge
* Merge branch 'feature2553-v4-rebased'Nick Mathewson2011-11-30
|\
| * Add some more documentationArturo Filastò2011-11-30
| * Turn off LearnCircuitBuildTimeout when tor2web mode is onRobert Ransom2011-11-30
| * Add ifdefs to disable assertion in connection_ap_handshake_send_beginRobert Ransom2011-11-30
| * Add ifdefs to disable #3332 assertionsRobert Ransom2011-11-30
| * Use single-hop intro and rend circuits when in tor2web modeRobert Ransom2011-11-30
| * Perform single-hop HS desc fetches when in tor2web modeRobert Ransom2011-11-30
| * Don't allow tor2web-mode Tors to connect to non-HS addressesRobert Ransom2011-11-30
| * Warn loudly on startup and SIGHUP if Tor is built for a non-anonymous modeRobert Ransom2011-11-30
| * Add a compile-time #define to control whether Tor runs in 'tor2web mode'Robert Ransom2011-11-30
| * Add Tor2webMode configuration optionRobert Ransom2011-11-24
* | Merge branch 'bug933_nm_rebased_v2'Nick Mathewson2011-11-30
|\ \
| * | Tweak addressmap_rewrite a little moreNick Mathewson2011-11-30
| * | Fix an issue in my mapaddress domains code spotted by armaNick Mathewson2011-11-30
| * | Add some post-comma spaces to please armaNick Mathewson2011-11-30
| * | Forbid remapping of *Nick Mathewson2011-11-30
| * | Refactor addressmap_match_superdomains and representation of wildcardsNick Mathewson2011-11-30
| * | Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/9...Robert Hogan2011-11-30
| * | Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/9...Robert Hogan2011-11-30
| * | bug933 - Match against super-domains in MapAddressRobert Hogan2011-11-30
* | | Fix a memory leak in error path of my default-torrc codeNick Mathewson2011-11-30
* | | appease "make check-spaces"Nick Mathewson2011-11-30
* | | Merge branch 'ipv6_bridges_squashed'Nick Mathewson2011-11-30
|\ \ \
| * | | Rename one more recalcitrant function.Nick Mathewson2011-11-30
| * | | Warn user about client ignoring non-preferred IP address for a bridge.Linus Nordberg2011-11-30
| * | | Whitespace changes.Linus Nordberg2011-11-30
| * | | Make the router_get_*_orport interface consistent with node_*.Linus Nordberg2011-11-30
| * | | Make router_get_{prim,alt,pref}_addr_port take tor_addr_port_t *.Linus Nordberg2011-11-30
| * | | Merge node_get_{prim,pref,pref_ipv6}_addr with their _orport counterparts.Linus Nordberg2011-11-30
| * | | Use correct address family where necessary for bridges on IPv6.Linus Nordberg2011-11-30
| * | | Use the preferred address and port when initiating a connection.Linus Nordberg2011-11-30
| * | | Take IPv6 into account when rewriting routerinfo for a bridge and maintain ip...Linus Nordberg2011-11-30
| * | | Use preferred address when looking for bridges by routerinfo_t.Linus Nordberg2011-11-30
| * | | Clarify function documentation.Linus Nordberg2011-11-30
| * | | First chunk of support for bridges on IPv6Linus Nordberg2011-11-30
| * | | Turn get_first_advertised_v4_port_by_type() into get_first_advertised_port_by...Linus Nordberg2011-11-30
| * | | Add some logging and comments.Linus Nordberg2011-11-30
| * | | Bridges can advertise a single IPv6 address with orportNick Mathewson2011-11-30
| * | | Initial support for simplest use of prop186 or-address linesNick Mathewson2011-11-30
| * | | Initial hacking for proposal 186.Nick Mathewson2011-11-30
* | | | Add an assert before dereferencing entry_conn->socks_requestRobert Ransom2011-11-29
|/ / /
* | | Merge remote-tracking branch 'rransom-tor/bug3460-v4'Nick Mathewson2011-11-29
|\ \ \
| * | | Correct documentation comments for fields formerly named accepted_introsRobert Ransom2011-11-27
| * | | Rename accepted_intros fieldsRobert Ransom2011-11-27
| * | | Reduce lifetime of DH public key replay-detection cache elementsRobert Ransom2011-10-31
| * | | Ignore timestamps of INTRODUCE2 cellsRobert Ransom2011-10-31
| * | | Move the real INTRODUCE2 replay-detection cache into rend_intro_point_tRobert Ransom2011-10-30
| * | | Make introduction points expireRobert Ransom2011-10-30
| * | | Allow intro points to expire somewhat gracefullyRobert Ransom2011-10-30
| * | | Use SMARTLIST_FOREACH_BEGIN and _END, not a for loopRobert Ransom2011-10-30