aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
Commit message (Collapse)AuthorAge
* Use an autobool for UseBridges_Nick Mathewson2011-06-03
|
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-06-03
|\
| * Add an "auto" option to UseBridgesNick Mathewson2011-06-02
| | | | | | | | | | | | | | UseBridges 1 now means "connect only to bridges; if you know no bridges, don't make connections." UseBridges auto means "Use bridges if they are known, and we have no EntryNodes set, and we aren't a server." UseBridges 0 means "don't use bridges."
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-06-01
|\|
| * stop asserting at bootRoger Dingledine2011-05-30
| | | | | | | | | | | | | | | | The patch for 3228 made us try to run init_keys() before we had loaded our state file, resulting in an assert inside init_keys. We had moved it too early in the function. Now it's later in the function, but still above the accounting calls.
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-30
|\|
| * minor cleanups while reviewing 3216Roger Dingledine2011-05-30
| |
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-30
|\|
| * Reinit keys at the start of options_act().Nick Mathewson2011-05-30
| | | | | | | | | | | | | | | | | | Previously we did this nearer to the end (in the old_options && transition_affects_workers() block). But other stuff cares about keys being consistent with options... particularly anything which tries to access a key, which can die in assert_identity_keys_ok(). Fixes bug 3228; bugfix on 0.2.2.18-alpha.
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-23
|\| | | | | | | | | | | Conflicts: src/common/Makefile.am src/or/control.c
| * Merge branch 'feature3049-v2' into maint-0.2.2Nick Mathewson2011-05-23
| |\ | | | | | | | | | | | | Conflicts: src/common/Makefile.am
| | * Exit immediately if we can't monitor our owning controller processRobert Ransom2011-05-20
| | | | | | | | | | | | | | | | | | | | | tor_process_monitor_new can't currently return NULL, but if it ever can, we want that to be an explicitly fatal error, without relying on the fact that monitor_owning_controller_process's chain of caller will exit if it fails.
| | * Implement __OwningControllerProcess optionRobert Ransom2011-05-20
| | | | | | | | | | | | Implements part of feature 3049.
* | | Merge branch 'maint-0.2.2'Roger Dingledine2011-05-21
|\| |
| * | Don't recreate descriptor on sighupSebastian Hahn2011-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to regenerate our descriptor whenever we'd get a sighup. This was caused by a bug in options_transition_affects_workers() that would return true even if the options were exactly the same. Down the call path we'd call init_keys(), which made us make a new descriptor which the authorities would reject, and the node would subsequently fall out of the consensus. This patch fixes only the first part of this bug: options_transition_affects_workers() behaves correctly now. The second part still wants a fix.
* | | Merge branch 'maint-0.2.2'Roger Dingledine2011-05-20
|\| |
| * | log the reason for publishing a new relay descriptorRoger Dingledine2011-05-19
| | | | | | | | | | | | now we have a better chance of hunting down the root cause of bug 1810.
* | | Merge branch 'maint-0.2.2'Roger Dingledine2011-05-17
|\| |
| * | discard circuits when we change our bridge configurationRoger Dingledine2011-05-17
| | | | | | | | | | | | | | | otherwise we might reuse circuits from the previous configuration, which could be bad depending on the user's situation
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-17
|\| |
| * | Fix bug2752 : 48-char HTTPProxyAuthenticator limitationMichael Yakubovich2011-05-16
| | | | | | | | | | | | | | | | | | Bumped the char maximum to 512 for HTTPProxyAuthenticator & HTTPSProxyAuthenticator. Now stripping all '\n' after base64 encoding in alloc_http_authenticator.
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-15
|\| |
| * | Clean up the 2972 implementation a littleSebastian Hahn2011-05-15
| | |
| * | Add UnixSocketsGroupWritable config flagJérémy Bobbio2011-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running a system-wide instance of Tor on Unix-like systems, having a ControlSocket is a quite handy mechanism to access Tor control channel. But it would be easier if access to the Unix domain socket can be granted by making control users members of the group running the Tor process. This change introduces a UnixSocketsGroupWritable option, which will create Unix domain sockets (and thus ControlSocket) 'g+rw'. This allows ControlSocket to offer same access control measures than ControlPort+CookieAuthFileGroupReadable. See <http://bugs.debian.org/552556> for more details.
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-15
|\| | | | | | | | | | | | | | Conflicts: src/or/circuitbuild.h
| * | Preserve bridge download status across SETCONF, HUPNick Mathewson2011-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code changes it so that we don't remove bridges immediately when we start re-parsing our configuration. Instead, we mark them all, and remove all the marked ones after re-parsing our bridge lines. As we add a bridge, we see if it's already in the list. If so, we just unmark it. This new behavior will lose the property we used to have that bridges were in bridge_list in the same order in which they appeared in the torrc. I took a quick look through the code, and I'm pretty sure we didn't actually depend on that anywhere. This is for bug 3019; it's a fix on 0.2.0.3-alpha.
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-15
|\| |
| * | Fixup whitespace issues from 3122 commitNick Mathewson2011-05-15
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-15
|\| | | | | | | | | | | | | | Conflicts: src/or/connection_edge.c
| * | Handle transitions in Automap*, VirtualAddrNetwork correctlyNick Mathewson2011-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if they changed in torrc during a SIGHUP, all was well, since we would just clear all transient entries from the addrmap thanks to bug 1345. But if you changed them from the controller, Tor would leave old mappings in place. The VirtualAddrNetwork bug has been here since 0.1.1.19-rc; the AutomapHosts* bug has been here since 0.2.0.1-alpha.
| * | When TrackExitHosts changes, remove all no-longer-valid mappingsNick Mathewson2011-05-13
| | | | | | | | | | | | | | | | | | | | | | | | This bug couldn't happen when TrackExitHosts changed in torrc, since the SIGHUP to reload the torrc would clear out all the transient addressmap entries before. But if you used SETCONF to change TrackExitHosts, old entries would be left alone: that's a bug, and so this is a bugfix on Tor 0.1.0.1-rc.
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-13
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c src/or/dirserv.c src/or/or.h
| * | Add a ControlPortFileGroupWritable optionNick Mathewson2011-05-13
| | |
| * | Write automatically-chosen control ports to a file.Nick Mathewson2011-05-13
| | |
| * | Advertise correct DirPort/ORPort when configured with "auto"Nick Mathewson2011-05-13
| | | | | | | | | | | | | | | | | | We'll eventually want to do more work here to make sure that the ports are stable over multiple invocations. Otherwise, turning your node on and off will get you a new DirPort/ORPort needlessly.
| * | Correct the signature for is_listening_on_low_port for "auto" portsNick Mathewson2011-05-13
| | |
| * | "(Socks|Control|etc)Port auto" now tells Tor to open an arbitrary portNick Mathewson2011-05-13
| | | | | | | | | | | | This is the major part of the implementation for trac issue 3076.
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-11
|\| |
| * | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-05-11
| |\ \ | | |/ | |/|
| | * Fix crash when read_file_to_string() fails in SAVECONFNick Mathewson2011-05-11
| | | | | | | | | | | | | | | | | | The new behavior is to try to rename the old file if there is one there that we can't read. In all likelihood, that will fail too, but at least we tried, and at least it won't crash.
| | * Backport: Generate version tags using Git, not (broken) svn revisions.Nick Mathewson2011-03-11
| | | | | | | | | | | | | | | | | | Partial backport of daa0326aaaa85a760be94ee2360cfa61a9fb5be2 . Resolves bug 2402. Bugfix on 0.2.1.15 (for the part where we switched to git) and on 0.2.1.30 (for the part where we dumped micro-revisions.)
| | * Revert "Simplest fix to bug2402: do not include SVN versions"Nick Mathewson2011-03-11
| | | | | | | | | | | | | | | | | | | | | This reverts commit a1073ee956021ead19d30c2151510dbaced416a8. Apparently, we totally misunderstood how the debian packages were using microrevisions. Better fix that!
| | * Merge remote branch 'public/bug2402_nothing' into maint-0.2.1Nick Mathewson2011-02-22
| | |\
| | | * Simplest fix to bug2402: do not include SVN versionsNick Mathewson2011-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we stopped using svn, 0.2.1.x lost the ability to notice its svn revision and report it in the version number. However, it kept looking at the micro-revision.i file... so if you switched to master, built tor, then switched to 0.2.1.x, you'd get a micro-revision.i file from master reported as an SVN tag. This patch takes out the "include the svn tag" logic entirely. Bugfix on 0.2.1.15-rc; fixes bug 2402.
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-09
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/or/directory.c
| * | | Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2Nick Mathewson2011-05-09
| |\ \ \
| | * | | Only authorities should automatically download v2 networkstatus documentsNick Mathewson2011-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients and relays haven't used them since early 0.2.0.x. The only remaining use by authorities learning about new relays ahead of scedule; see proposal 147 for what we intend to do about that. We're leaving in an option (FetchV2Networkstatus) to manually fetch v2 networkstatuses, because apparently dnsel and maybe bwauth want them. This fixes bug 3022.
* | | | | Code to make clients fetch and use microdescriptors for circuit buildingNick Mathewson2011-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To turn this on, set UseMicrodescriptors to "1" (or "auto" if you want it on-if-you're-a-client). It should go auto-by-default once 0.2.3.1-alpha is released. Because of our node logic, directory caches will never use microdescriptors when they have the right routerinfo available.
* | | | | Replace _AUTHORITY enum values with _DIRINFO values (automted)Nick Mathewson2011-05-05
| | | | |
* | | | | Automated rename from authority_type_t to dirinfo_type_tNick Mathewson2011-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | We were already overloading this type to mean "a directory that can serve us X" in addition to "a directory that is an authority for X."