aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Expand)AuthorAge
* Whitespace fixesNick Mathewson2012-11-04
* Clean up nonsensical calling convention for config_load_geoip_file_Nick Mathewson2012-11-04
* Merge remote-tracking branch 'linus/bug5053-bug5055'Nick Mathewson2012-11-04
|\
| * Change some comments to reflect the multitude of GeoIP databases.Linus Nordberg2012-10-31
| * Don't memcmp struct in6_addr but rather its s6_addr member.Linus Nordberg2012-10-31
| * Duplicate less code.Linus Nordberg2012-10-31
| * Name variables more consistently.Linus Nordberg2012-10-22
| * Document two functions.Linus Nordberg2012-10-22
| * Rename C reserved identifiers missed before.Linus Nordberg2012-10-20
| * Add "IPVersions" to control command "status/clients-seen".Linus Nordberg2012-10-20
| * Duplicate less code.Linus Nordberg2012-10-20
| * Separate IPv4 and IPv6 geoip file loading.Linus Nordberg2012-10-20
| * White space.Linus Nordberg2012-10-17
| * Two changes lost in rebase resurrected.Linus Nordberg2012-10-17
| * Rename reserved C identifiers.Linus Nordberg2012-10-17
| * Minor tweaks to nils' v4 vs v6 bridge usage code.Karsten Loesing2012-10-17
| * Minor tweaks and comments to nils' geoip v6 code.Karsten Loesing2012-10-17
| * Include statistics as to how many connections are IPv4 versus IPv6nils2012-10-17
| * Add GeoIP database for IPv6 addressesnils2012-10-17
| * Rename address family specific IPv4 geoip functions in preparation for IPv6 s...nils2012-10-17
* | Avoid c99 designated initializers in circuitmux_ewma.cNick Mathewson2012-11-02
* | Fix whitespaceNick Mathewson2012-10-31
* | Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/torAndrea Shepard2012-10-30
|\ \
| * | Try refactoring channel list to use HT_ and LIST_ stuff directlyNick Mathewson2012-10-12
| * | Use SIMPLEQ, not smartlist_t, for channel cell queues.Nick Mathewson2012-10-12
* | | Fix a remotely triggerable assertion failure (CVE-2012-2250)Nick Mathewson2012-10-23
* | | Merge branch 'maint-0.2.3'Roger Dingledine2012-10-23
|\ \ \
| * | | Let 0.2.3 clients exit to internal addresses if they wantRoger Dingledine2012-10-23
* | | | fix typoRoger Dingledine2012-10-23
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-10-23
|\| | |
| * | | Fix parse_short_policy (bug 7192.)Nick Mathewson2012-10-23
| * | | add a unit test to expose bug 7192Roger Dingledine2012-10-22
| * | | Merge branch 'block_renegotiate_023' into maint-0.2.3Nick Mathewson2012-10-19
| |\ \ \
| | * | | Discard extraneous renegotiation attempts in the v3 link protocolNick Mathewson2012-10-17
* | | | | Fix more madness from the split_circuitbuild mergeNick Mathewson2012-10-22
* | | | | Kill extraneous x from 907db008ab0007f0a02Nick Mathewson2012-10-22
* | | | | Merge branch 'split_circuitbuild'Nick Mathewson2012-10-22
|\ \ \ \ \
| * | | | | Move the circuit build timeout code into its own file.Nick Mathewson2012-10-15
| * | | | | Split code for entry guards and bridges into a new module.Nick Mathewson2012-10-15
* | | | | | Merge branch 'block_renegotiate_024'Nick Mathewson2012-10-19
|\ \ \ \ \ \
| * | | | | | Discard extraneous renegotiation attempts in the v3 link protocolNick Mathewson2012-10-17
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-10-19
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Don't serve or accept v2 HS descs over a DirPortRobert Ransom2012-10-19
| | |_|/ / / | |/| | | |
| * | | | | Don't call fmt_addr() twice in a parameter list.George Kadianakis2012-10-09
* | | | | | Factor out common parts of channel_tls_connect() and channel_tls_handle_incom...Andrea Shepard2012-10-18
* | | | | | Fix a bug in channel_dump_statisticsNick Mathewson2012-10-17
* | | | | | Document lifespan of return values of the _remote_descr() funcsNick Mathewson2012-10-17
* | | | | | Restore the 'address' value of tunneled connectionsNick Mathewson2012-10-17
* | | | | | Fix for bug 7112 (spewing complaints from tor_addr_is_internal)Nick Mathewson2012-10-17
* | | | | | Document return value of channel_get_addr_if_possibleNick Mathewson2012-10-17