September 2014 - tor-commits - lists.torproject.org

[oonib/master] Write to a tor logfile
by art＠torproject.org 29 Sep '14

29 Sep '14

commit 93edf6df743f263c79567ce15a76c5baf9d2d7f2 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Sep 20 15:02:04 2014 +0200 Write to a tor logfile --- oonib/onion.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oonib/onion.py b/oonib/onion.py index 1950a41..9c94d02 100644 --- a/oonib/onion.py +++ b/oonib/onion.py @@ -74,6 +74,9 @@ def startTor(torconfig): torconfig.DataDirectory = os.path.abspath(config.main.tor_datadir) else: raise Exception + + tor_log_file = os.path.join(torconfig.DataDirectory, "tor.log") + torconfig.Log = ["notice stdout", "notice file %s" % tor_log_file] torconfig.save() if not hasattr(torconfig, 'ControlPort'): control_port = int(randomFreePort())

1 0

[oonib/master] Set default report file path to include country code.
by art＠torproject.org 29 Sep '14

29 Sep '14

commit 74494091a09bc392d767ded9ff3af26b4e69a7e9 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Sep 29 13:42:25 2014 +0200 Set default report file path to include country code. Fix calling of report_file_name --- oonib/report/handlers.py | 2 +- oonib/test/test_report.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 13cc06e..9aa5df9 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -28,7 +28,7 @@ def report_file_name(archive_dir, report_details): minute=timestamp.strftime("%M"), second=timestamp.strftime("%S") ) - report_file_template = "{test_name}-{iso8601_timestamp}-{probe_asn}-probe.yamloo" + report_file_template = "{probe_cc}/{test_name}-{iso8601_timestamp}-{probe_asn}-probe.yamloo" if config.main.report_file_template: report_file_template = config.main.report_file_template dst_filename = os.path.join(archive_dir, report_file_template.format(**keys)) diff --git a/oonib/test/test_report.py b/oonib/test/test_report.py index 59c539f..9da8b08 100644 --- a/oonib/test/test_report.py +++ b/oonib/test/test_report.py @@ -197,8 +197,7 @@ class TestReport(HandlerTestCase): response = yield self.request('/report/%s/close' % report_id, "POST") - written_report_path = os.path.join(written_report_header['probe_cc'], - report_file_name(written_report_header)) + written_report_path = report_file_name(".", written_report_header) with open(written_report_path) as f: self.filenames.add(written_report_path) written_report = yaml.safe_load_all(f)

1 0

[oonib/master] update oonibackend to 1.1.3
by art＠torproject.org 29 Sep '14

29 Sep '14

commit a20bf774592c318d1aa5f842eb79b5ea959f7a82 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Sep 29 20:12:15 2014 +0200 update oonibackend to 1.1.3 --- ChangeLog.rst | 7 +++++++ oonib/__init__.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 39a6df6..c7c318a 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,5 +1,12 @@ ChangeLog ========= +1.1.3 (Wed, 3 Sep 2014) +----------------------- + +* Add support for specifying the report archive path from config file + +* Write tor notice level logs to file + 1.1.2 (Wed, 3 Sep 2014) ----------------------- diff --git a/oonib/__init__.py b/oonib/__init__.py index 06dfb90..2147635 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -3,7 +3,7 @@ In here we shall keep track of all variables and objects that should be instantiated only once and be common to pieces of GLBackend code. """ -__version__ = '1.1.2' +__version__ = '1.1.3' __all__ = ['Storage', 'randomStr']

1 0

[tor/master] Clear the cached address from resolve_my_address() when our IP changes
by nickm＠torproject.org 29 Sep '14

29 Sep '14

commit b448ec195dd8687d2d5f363e12fec046eb2d1677 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 29 13:46:30 2014 -0400 Clear the cached address from resolve_my_address() when our IP changes Closes 11582; patch from "ra". --- changes/ticket11582 | 5 +++++ src/or/config.c | 7 +++++++ src/or/config.h | 1 + src/or/connection.c | 2 ++ 4 files changed, 15 insertions(+) diff --git a/changes/ticket11582 b/changes/ticket11582 new file mode 100644 index 0000000..e54f779 --- /dev/null +++ b/changes/ticket11582 @@ -0,0 +1,5 @@ + o Minor features: + - Re-check our address after we detect a changed IP address from + getsockname(). This ensures that the controller command "GETINFO + address" will report the correct value. Resolves ticket 11582. + Patch from "ra". \ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index d620f58..921d032 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2037,6 +2037,13 @@ get_last_resolved_addr(void) return last_resolved_addr; } +/** Reset last_resolved_addr from outside this file. */ +void +reset_last_resolved_addr(void) +{ + last_resolved_addr = 0; +} + /** * Use <b>options-\>Address</b> to guess our public IP address. * diff --git a/src/or/config.h b/src/or/config.h index 8a1919c..fd95698 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -29,6 +29,7 @@ setopt_err_t options_trial_assign(config_line_t *list, int use_defaults, int clear_first, char **msg); uint32_t get_last_resolved_addr(void); +void reset_last_resolved_addr(void); int resolve_my_address(int warn_severity, const or_options_t *options, uint32_t *addr_out, const char **method_out, char **hostname_out); diff --git a/src/or/connection.c b/src/or/connection.c index 4a3bd2c..5c1b6d9 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4386,6 +4386,8 @@ client_check_address_changed(tor_socket_t sock) SMARTLIST_FOREACH(outgoing_addrs, tor_addr_t*, a_ptr, tor_free(a_ptr)); smartlist_clear(outgoing_addrs); smartlist_add(outgoing_addrs, tor_memdup(&out_addr, sizeof(tor_addr_t))); + /* We'll need to resolve ourselves again. */ + reset_last_resolved_addr(); /* Okay, now change our keys. */ ip_address_changed(1); }

1 0

[tor/master] continue our habit of specifying the default in the manpage
by arma＠torproject.org 29 Sep '14

29 Sep '14

commit e440993f95fad6d5a049be83517c8586fff7ab21 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 29 13:33:50 2014 -0400 continue our habit of specifying the default in the manpage --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c9172b8..ff17819 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1659,7 +1659,7 @@ is non-zero): should hibernate) during a time interval. Set to "max" to calculate using the higher of either the sent or received bytes (this is the default functionality). Set to "sum" to calculate using the sent - plus received bytes. + plus received bytes. (Default: max) [[AccountingStart]] **AccountingStart** **day**|**week**|**month** [__day__] __HH:MM__:: Specify how long accounting periods last. If **month** is given, each

1 0

[meek/master] Don't show error text that may contain public IPs.
by dcf＠torproject.org 29 Sep '14

29 Sep '14

commit 05f244a5bfa137da662a8296a34f13e58aa23137 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 29 10:18:36 2014 -0700 Don't show error text that may contain public IPs. The error messages looked like these: 2014/09/28 22:33:46 copying body to ORPort: write tcp 127.0.0.1:YYYY: connection reset by peer 2014/09/29 01:53:17 copying body to ORPort: read tcp X.X.X.X:YYYY: i/o timeout 2014/09/29 03:27:00 writing to response: write tcp X.X.X.X:YYYY: broken pipe 2014/09/29 06:39:53 writing to response: write tcp X.X.X.X:YYYY: i/o timeout I don't know how to keep the e.g. "connection reset by peer" part without keeping the IP, so just leave the whole thing off. The "copying body to ORPort" message in the "write tcp" case message only has a localhost IP, but treat it the same way. The "reading from ORPort" error only ever has a localhost IP, so I'm leaving it in. --- meek-server/meek-server.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 44abbb0..81a1757 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -150,7 +150,8 @@ func transact(session *Session, w http.ResponseWriter, req *http.Request) error body := http.MaxBytesReader(w, req.Body, maxPayloadLength+1) _, err := io.Copy(session.Or, body) if err != nil { - return fmt.Errorf("copying body to ORPort: %s", err) + // Omit err because it contains an IP address. + return fmt.Errorf("error copying body to ORPort") } buf := make([]byte, maxPayloadLength) @@ -167,7 +168,8 @@ func transact(session *Session, w http.ResponseWriter, req *http.Request) error w.Header().Set("Content-Type", "application/octet-stream") n, err = w.Write(buf[:n]) if err != nil { - return fmt.Errorf("writing to response: %s", err) + // Omit err because it contains an IP address. + return fmt.Errorf("error writing to response") } // log.Printf("wrote %d bytes to response", n) return nil

1 0

[meek/master] Simplify with gofmt -s.
by dcf＠torproject.org 29 Sep '14

29 Sep '14

commit ea6c955744eeb77c91c10e90af308b772ba19670 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 29 09:58:58 2014 -0700 Simplify with gofmt -s. gofmt -l -w -s . --- meek-client/helper_test.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/meek-client/helper_test.go b/meek-client/helper_test.go index 291ab11..4899f84 100644 --- a/meek-client/helper_test.go +++ b/meek-client/helper_test.go @@ -7,24 +7,24 @@ import ( func TestMakeProxySpec(t *testing.T) { badTests := [...]url.URL{ - url.URL{Scheme: "http"}, - url.URL{Scheme: "http", Host: ":"}, - url.URL{Scheme: "http", Host: "localhost"}, - url.URL{Scheme: "http", Host: "localhost:"}, - url.URL{Scheme: "http", Host: ":8080"}, - url.URL{Scheme: "http", Host: "localhost:https"}, - url.URL{Scheme: "http", Host: "localhost:8080", User: url.User("username")}, - url.URL{Scheme: "http", Host: "localhost:8080", User: url.UserPassword("username", "password")}, - url.URL{Scheme: "http", User: url.User("username"), Host: "localhost:8080"}, - url.URL{Scheme: "http", User: url.UserPassword("username", "password"), Host: "localhost:8080"}, - url.URL{Scheme: "http", Host: "localhost:-1"}, - url.URL{Scheme: "http", Host: "localhost:65536"}, - url.URL{Scheme: "socks5", Host: ":"}, - url.URL{Scheme: "socks4a", Host: ":"}, + {Scheme: "http"}, + {Scheme: "http", Host: ":"}, + {Scheme: "http", Host: "localhost"}, + {Scheme: "http", Host: "localhost:"}, + {Scheme: "http", Host: ":8080"}, + {Scheme: "http", Host: "localhost:https"}, + {Scheme: "http", Host: "localhost:8080", User: url.User("username")}, + {Scheme: "http", Host: "localhost:8080", User: url.UserPassword("username", "password")}, + {Scheme: "http", User: url.User("username"), Host: "localhost:8080"}, + {Scheme: "http", User: url.UserPassword("username", "password"), Host: "localhost:8080"}, + {Scheme: "http", Host: "localhost:-1"}, + {Scheme: "http", Host: "localhost:65536"}, + {Scheme: "socks5", Host: ":"}, + {Scheme: "socks4a", Host: ":"}, // "socks" and "socks4" are unknown types. - url.URL{Scheme: "socks", Host: "localhost:1080"}, - url.URL{Scheme: "socks4", Host: "localhost:1080"}, - url.URL{Scheme: "unknown", Host: "localhost:9999"}, + {Scheme: "socks", Host: "localhost:1080"}, + {Scheme: "socks4", Host: "localhost:1080"}, + {Scheme: "unknown", Host: "localhost:9999"}, } goodTests := [...]struct { input url.URL

1 0

[meek/master] Rewrite 'errors.New(fmt.Sprintf(...)) -> fmt.Errorf(...)'.
by dcf＠torproject.org 29 Sep '14

29 Sep '14

commit fe4c33126c8783caa032cd822769c6b49529bed9 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 29 10:05:41 2014 -0700 Rewrite 'errors.New(fmt.Sprintf(...)) -> fmt.Errorf(...)'. gofmt -l -w -r 'errors.New(fmt.Sprintf(a)) -> fmt.Errorf(a)' ./appengine ./meek-server ./meek-client-torbrowser ./meek-client ./latencytest ./terminateprocess-buffer gofmt -l -w -r 'errors.New(fmt.Sprintf(a, b)) -> fmt.Errorf(a, b)' ./appengine ./meek-server ./meek-client-torbrowser ./meek-client ./latencytest ./terminateprocess-buffer gofmt -l -w -r 'errors.New(fmt.Sprintf(a, b, c)) -> fmt.Errorf(a, b, c)' ./appengine ./meek-server ./meek-client-torbrowser ./meek-client ./latencytest ./terminateprocess-buffer gofmt -l -w -r 'errors.New(a) -> fmt.Errorf(a)' ./appengine ./meek-server ./meek-client-torbrowser ./meek-client ./latencytest ./terminateprocess-buffer --- meek-client/helper.go | 14 +++++++------- meek-client/meek-client.go | 9 ++++----- meek-client/proxy.go | 5 ++--- meek-server/meek-server.go | 7 +++---- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/meek-client/helper.go b/meek-client/helper.go index 872f401..37c4615 100644 --- a/meek-client/helper.go +++ b/meek-client/helper.go @@ -4,7 +4,6 @@ import ( "bytes" "encoding/binary" "encoding/json" - "errors" "fmt" "io" "io/ioutil" @@ -55,14 +54,14 @@ func makeProxySpec(u *url.URL) (*ProxySpec, error) { // Firefox's nsIProxyInfo doesn't allow credentials. if u.User != nil { - return nil, errors.New("proxy URLs with a username or password can't be used with the helper") + return nil, fmt.Errorf("proxy URLs with a username or password can't be used with the helper") } switch u.Scheme { case "http", "socks5", "socks4a": spec.Type = u.Scheme default: - return nil, errors.New("unknown scheme") + return nil, fmt.Errorf("unknown scheme") } spec.Host, portStr, err = net.SplitHostPort(u.Host) @@ -70,7 +69,7 @@ func makeProxySpec(u *url.URL) (*ProxySpec, error) { return nil, err } if spec.Host == "" { - return nil, errors.New("missing host") + return nil, fmt.Errorf("missing host") } port, err = strconv.ParseUint(portStr, 10, 16) if err != nil { @@ -130,8 +129,9 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) return nil, err } if length > maxHelperResponseLength { - return nil, errors.New(fmt.Sprintf("helper's returned data is too big (%d > %d)", - length, maxHelperResponseLength)) + return nil, fmt.Errorf("helper's returned data is too big (%d > %d)", + length, maxHelperResponseLength) + } encResp := make([]byte, length) _, err = io.ReadFull(s, encResp) @@ -147,7 +147,7 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) return nil, err } if jsonResp.Error != "" { - return nil, errors.New(fmt.Sprintf("helper returned error: %s", jsonResp.Error)) + return nil, fmt.Errorf("helper returned error: %s", jsonResp.Error) } // Mock up an HTTP response. diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 33861e5..447e785 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -33,7 +33,6 @@ import ( "bytes" "crypto/rand" "encoding/base64" - "errors" "flag" "fmt" "io" @@ -147,7 +146,7 @@ again: // returned a status other than 200. Other kinds of errors and success // with 200 always return immediately. if err == nil && resp.StatusCode != http.StatusOK { - err = errors.New(fmt.Sprintf("status code was %d, not %d", resp.StatusCode, http.StatusOK)) + err = fmt.Errorf("status code was %d, not %d", resp.StatusCode, http.StatusOK) if limit > 0 { log.Printf("%s; trying again after %.f seconds (%d)", err, retryDelay.Seconds(), limit) time.Sleep(retryDelay) @@ -328,7 +327,7 @@ func checkProxyURL(u *url.URL) error { if options.HelperAddr == nil { // Without the helper we only support HTTP proxies. if u.Scheme != "http" { - return errors.New(fmt.Sprintf("don't understand proxy URL scheme %q", u.Scheme)) + return fmt.Errorf("don't understand proxy URL scheme %q", u.Scheme) } } else { // With the helper we can use HTTP and SOCKS (because it is the @@ -345,10 +344,10 @@ func checkProxyURL(u *url.URL) error { switch u.Scheme { case "http", "socks5", "socks4a": default: - return errors.New(fmt.Sprintf("don't understand proxy URL scheme %q", u.Scheme)) + return fmt.Errorf("don't understand proxy URL scheme %q", u.Scheme) } if u.User != nil { - return errors.New("a proxy URL with a username or password can't be used with --helper") + return fmt.Errorf("a proxy URL with a username or password can't be used with --helper") } } return nil diff --git a/meek-client/proxy.go b/meek-client/proxy.go index 56717a3..8258413 100644 --- a/meek-client/proxy.go +++ b/meek-client/proxy.go @@ -1,7 +1,6 @@ package main import ( - "errors" "fmt" "net/url" "os" @@ -33,10 +32,10 @@ func PtGetProxyURL() (*url.URL, error) { return nil, err } if u.Scheme == "" { - return nil, errors.New("missing scheme") + return nil, fmt.Errorf("missing scheme") } if u.Host == "" { - return nil, errors.New("missing host") + return nil, fmt.Errorf("missing host") } return u, nil } diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 4edf850..44abbb0 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -13,7 +13,6 @@ package main import ( "crypto/tls" - "errors" "flag" "fmt" "io" @@ -151,7 +150,7 @@ func transact(session *Session, w http.ResponseWriter, req *http.Request) error body := http.MaxBytesReader(w, req.Body, maxPayloadLength+1) _, err := io.Copy(session.Or, body) if err != nil { - return errors.New(fmt.Sprintf("copying body to ORPort: %s", err)) + return fmt.Errorf("copying body to ORPort: %s", err) } buf := make([]byte, maxPayloadLength) @@ -160,7 +159,7 @@ func transact(session *Session, w http.ResponseWriter, req *http.Request) error if err != nil { if e, ok := err.(net.Error); !ok || !e.Timeout() { httpInternalServerError(w) - return errors.New(fmt.Sprintf("reading from ORPort: %s", err)) + return fmt.Errorf("reading from ORPort: %s", err) } } // log.Printf("read %d bytes from ORPort: %q", n, buf[:n]) @@ -168,7 +167,7 @@ func transact(session *Session, w http.ResponseWriter, req *http.Request) error w.Header().Set("Content-Type", "application/octet-stream") n, err = w.Write(buf[:n]) if err != nil { - return errors.New(fmt.Sprintf("writing to response: %s", err)) + return fmt.Errorf("writing to response: %s", err) } // log.Printf("wrote %d bytes to response", n) return nil

1 0

[tor/master] Don't use the getaddrinfo sandbox cache from tor-resolve
by nickm＠torproject.org 29 Sep '14

29 Sep '14

commit 09951bea7fe30cd91d8a4dee95278218f0aa199e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 29 12:57:07 2014 -0400 Don't use the getaddrinfo sandbox cache from tor-resolve Fixes bug 13295; bugfix on 0.2.5.3-alpha. The alternative here is to call crypto_global_init() from tor-resolve, but let's avoid linking openssl into tor-resolve for as long as we can. --- changes/13295 | 5 +++++ src/common/sandbox.c | 21 +++++++++++++++++++++ src/common/sandbox.h | 2 ++ src/tools/tor-resolve.c | 2 ++ 4 files changed, 30 insertions(+) diff --git a/changes/13295 b/changes/13295 new file mode 100644 index 0000000..4334325 --- /dev/null +++ b/changes/13295 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Disable sandbox name resolver cache when running tor-resolve: + tor-resolve doesn't use the sandbox code, and turning it on was + breaking attempts to do tor-resolve on a non-default server on + Linux. Fixes bug 13295; bugfix on 0.2.5.3-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 05b91be..dbbaa59 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1385,6 +1385,18 @@ HT_GENERATE(getaddrinfo_cache, cached_getaddrinfo_item_t, node, cached_getaddrinfo_items_eq, 0.6, tor_malloc_, tor_realloc_, tor_free_); +/** If true, don't try to cache getaddrinfo results. */ +static int sandbox_getaddrinfo_cache_disabled = 0; + +/** Tell the sandbox layer not to try to cache getaddrinfo results. Used as in + * tor-resolve, when we have no intention of initializing crypto or of + * installing the sandbox.*/ +void +sandbox_disable_getaddrinfo_cache(void) +{ + sandbox_getaddrinfo_cache_disabled = 1; +} + int sandbox_getaddrinfo(const char *name, const char *servname, const struct addrinfo *hints, @@ -1393,6 +1405,10 @@ sandbox_getaddrinfo(const char *name, const char *servname, int err; struct cached_getaddrinfo_item_t search, *item; + if (sandbox_getaddrinfo_cache_disabled) { + return getaddrinfo(name, NULL, hints, res); + } + if (servname != NULL) { log_warn(LD_BUG, "called with non-NULL servname"); return EAI_NONAME; @@ -1834,5 +1850,10 @@ sandbox_is_active(void) { return 0; } + +void +sandbox_disable_getaddrinfo_cache(void) +{ +} #endif diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 20d5d50..35d8777 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -208,5 +208,7 @@ int sandbox_init(sandbox_cfg_t* cfg); /** Return true iff the sandbox is turned on. */ int sandbox_is_active(void); +void sandbox_disable_getaddrinfo_cache(void); + #endif /* SANDBOX_H_ */ diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 306f6c6..480c7e5 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -8,6 +8,7 @@ #include "../common/util.h" #include "address.h" #include "../common/torlog.h" +#include "sandbox.h" #include <stdio.h> #include <stdlib.h> @@ -344,6 +345,7 @@ main(int argc, char **argv) log_severity_list_t *s = tor_malloc_zero(sizeof(log_severity_list_t)); init_logging(); + sandbox_disable_getaddrinfo_cache(); arg = &argv[1]; n_args = argc-1;

1 0

[tor/master] Merge branch 'bug13295_v2_025' into maint-0.2.5
by nickm＠torproject.org 29 Sep '14

29 Sep '14

commit e1a25f0c3602e007872277ef9ab437cc97cfd47b Merge: 87576e8 09951be Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 29 13:02:35 2014 -0400 Merge branch 'bug13295_v2_025' into maint-0.2.5 changes/13295 | 5 +++++ src/common/sandbox.c | 21 +++++++++++++++++++++ src/common/sandbox.h | 2 ++ src/tools/tor-resolve.c | 2 ++ 4 files changed, 30 insertions(+)

1 0