aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Expand)AuthorAge
* Merge branch 'bug11156_issue2_squashed'Nick Mathewson2014-04-23
|\
| * Slightly improve the documentation of src/or/transports.cGeorge Kadianakis2014-04-23
| * Rename the got_hup element of managed proxies.George Kadianakis2014-04-23
| * Don't halt bootstrap to figure out if we should restart PT proxies.George Kadianakis2014-04-23
* | Merge remote-tracking branch 'public/bug9229_025'Nick Mathewson2014-04-23
|\ \
| * | Make num_bridges_usable work properly.Nick Mathewson2014-04-08
| * | Fix our check for the "first" bridge descriptor.Nick Mathewson2014-03-10
* | | Merge remote-tracking branch 'public/bug9963_v2_024'Nick Mathewson2014-04-18
|\ \ \
| * | | Log descriptor-download bootstrapping messages less verboselyNick Mathewson2014-03-27
* | | | Merge remote-tracking branch 'public/sandbox_fixes_rebased_2'Nick Mathewson2014-04-16
|\ \ \ \
| * | | | Block certain option transitions while sandbox enabledNick Mathewson2014-04-16
| * | | | Don't reload logs or rewrite pidfile while sandbox is activeNick Mathewson2014-04-16
| * | | | Don't allow change to ConnLimit while sandbox is activeNick Mathewson2014-04-16
| * | | | Allow reloading torrc and writing to router-stabilityNick Mathewson2014-04-16
| * | | | Add a couple of missing renames so the server sandbox works againNick Mathewson2014-04-16
| * | | | Get Libevent's PRNG functioning under the linux sandboxNick Mathewson2014-04-16
| * | | | Make sure everything using an interned string is preceded by a logNick Mathewson2014-04-16
| * | | | Drop 'fr' parameter from sandbox code.Nick Mathewson2014-04-16
| * | | | Remove nonsensical exec permission from sandbox code.Nick Mathewson2014-04-16
| * | | | Add 'rename' to the sandboxed syscallsNick Mathewson2014-04-16
| * | | | Fix some initial sandbox issues.Nick Mathewson2014-04-16
* | | | | Merge remote-tracking branch 'andrea/bug11304'Nick Mathewson2014-04-16
|\ \ \ \ \
| * | | | | Call connection_or_close_for_error() properly if write_to_buf() ever fails on...Andrea Shepard2014-04-15
* | | | | | Merge remote-tracking branch 'andrea/bug11306'Nick Mathewson2014-04-16
|\ \ \ \ \ \
| * | | | | | Avoid redundant calls to connection_mark_for_close() on listeners when settin...Andrea Shepard2014-04-15
| * | | | | | Close orconns correctly through channels when setting DisableNetwork to 1Andrea Shepard2014-04-15
| |/ / / / /
* | | | | | Merge branch '10267_plus_10896_rebased_twice'Nick Mathewson2014-04-16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Call pf-divert openbsd-specific, not no-linuxNick Mathewson2014-04-16
| * | | | | Fix OSX compilation.Nick Mathewson2014-04-16
| * | | | | Whitespace, doc fixesNick Mathewson2014-04-16
| * | | | | Educate tor on OpenBSD's use of divert-to rules with the pf firewall.dana koch2014-04-16
| * | | | | tor_addr_from_sockaddr() is applicable in ipfw code, so use it.Nick Mathewson2014-04-16
| * | | | | ipfw TransPort support on FreeBSD (10267)Nick Mathewson2014-04-16
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-04-16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2014-04-16
| |\ \ \ \ \
| | * | | | | remove note about dannenberg; it has upgraded.Nick Mathewson2014-04-16
| * | | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2014-04-16
| |\| | | | |
| | * | | | | Update the authority signing key blacklistNick Mathewson2014-04-16
* | | | | | | Answer a question in a comment; fix a wide line.Nick Mathewson2014-04-15
* | | | | | | Uplift status.c unit test coverage with new test cases and macros.dana koch2014-04-15
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-04-15
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2014-04-15
| |\| | | | |
| | * | | | | Don't send uninitialized stack to the controller and say it's a date.Nick Mathewson2014-04-14
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-04-14
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2014-04-14
| |\| | | | |
| | * | | | | Tweak changes file and comment dates.Nick Mathewson2014-04-14
| | * | | | | Fill in the list of blacklisted signing keys.Nick Mathewson2014-04-14
| | * | | | | Code to blacklist authority signing keysNick Mathewson2014-04-14
* | | | | | | Demote "we stalled too much while trying to write" message to INFONick Mathewson2014-04-09
* | | | | | | Merge remote-tracking branch 'public/bug10431'Nick Mathewson2014-04-09
|\ \ \ \ \ \ \