June 2016 - tor-commits - lists.torproject.org

[tor/master] Mark src/common tor_assert(0)/tor_fragile_assert() unreached for coverage
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit 7b54d7ebbd963a0a40b6ff5109ea0e3eedde534d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 17:25:53 2016 -0400 Mark src/common tor_assert(0)/tor_fragile_assert() unreached for coverage I audited this to make sure I was only marking ones that really should be unreachable. --- src/common/address.c | 11 +++++++++-- src/common/aes.c | 2 +- src/common/compat.c | 5 ++++- src/common/log.c | 4 ++-- src/common/util.c | 2 ++ src/common/util_format.c | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 127e6a9..5cd7a8d 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -335,7 +335,7 @@ tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr) } else if (ent->h_addrtype == AF_INET6) { tor_addr_from_in6(addr, (struct in6_addr*) ent->h_addr); } else { - tor_assert(0); /* gethostbyname() returned a bizarre addrtype */ + tor_assert(0); // LCOV_EXCL_LINE: gethostbyname() returned bizarre type } return 0; } @@ -906,8 +906,10 @@ tor_addr_is_loopback(const tor_addr_t *addr) case AF_UNSPEC: return 0; default: + /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; + /* LCOV_EXCL_STOP */ } } @@ -1028,7 +1030,7 @@ tor_addr_copy_tight(tor_addr_t *dest, const tor_addr_t *src) case AF_UNSPEC: break; default: - tor_fragile_assert(); + tor_fragile_assert(); // LCOV_EXCL_LINE } } @@ -1097,6 +1099,7 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, case AF_INET6: { if (mbits > 128) mbits = 128; + const uint8_t *a1 = tor_addr_to_in6_addr8(addr1); const uint8_t *a2 = tor_addr_to_in6_addr8(addr2); const int bytes = mbits >> 3; @@ -1112,8 +1115,10 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, } } default: + /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; + /* LCOV_EXCL_STOP */ } } else if (how == CMP_EXACT) { /* Unequal families and an exact comparison? Stop now! */ @@ -1166,8 +1171,10 @@ tor_addr_hash(const tor_addr_t *addr) case AF_INET6: return siphash24g(&addr->addr.in6_addr.s6_addr, 16); default: + /* LCOV_EXCL_START */ tor_fragile_assert(); return 0; + /* LCOV_EXCL_END */ } } diff --git a/src/common/aes.c b/src/common/aes.c index e9f78f4..db250c8 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -283,7 +283,7 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) case 128: c = EVP_aes_128_ecb(); break; case 192: c = EVP_aes_192_ecb(); break; case 256: c = EVP_aes_256_ecb(); break; - default: tor_assert(0); + default: tor_assert(0); // LCOV_EXCL_LINE } EVP_EncryptInit(&cipher->key.evp, c, (const unsigned char*)key, NULL); cipher->using_evp = 1; diff --git a/src/common/compat.c b/src/common/compat.c index 9d49b8f..023325b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -526,8 +526,10 @@ tor_asprintf(char **strp, const char *fmt, ...) r = tor_vasprintf(strp, fmt, args); va_end(args); if (!*strp || r < 0) { + /* LCOV_EXCL_START */ log_err(LD_BUG, "Internal error in asprintf"); tor_assert(0); + /* LCOV_EXCL_STOP */ } return r; } @@ -2976,11 +2978,12 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, /* If we get here, then gmtime/localtime failed without getting an extreme * value for *timep */ - + /* LCOV_EXCL_START */ tor_fragile_assert(); r = resultbuf; memset(resultbuf, 0, sizeof(struct tm)); outcome="can't recover"; + /* LCOV_EXCL_STOP */ done: log_warn(LD_BUG, "%s("I64_FORMAT") failed with error %s: %s", islocal?"localtime":"gmtime", diff --git a/src/common/log.c b/src/common/log.c index e948ccf..51309aa 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -75,7 +75,7 @@ sev_to_string(int severity) case LOG_ERR: return "err"; default: /* Call assert, not tor_assert, since tor_assert * calls log on failure. */ - assert(0); return "UNKNOWN"; + assert(0); return "UNKNOWN"; // LCOV_EXCL_LINE } } @@ -95,7 +95,7 @@ should_log_function_name(log_domain_mask_t domain, int severity) return (domain & (LD_BUG|LD_NOFUNCNAME)) == LD_BUG; default: /* Call assert, not tor_assert, since tor_assert calls log on failure. */ - assert(0); return 0; + assert(0); return 0; // LCOV_EXCL_LINE } } diff --git a/src/common/util.c b/src/common/util.c index 1546fd1..b773aa7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2790,9 +2790,11 @@ unescape_string(const char *s, char **result, size_t *size_out) if (size_out) *size_out = out - *result; return cp+1; case '\0': + /* LCOV_EXCL_START */ tor_fragile_assert(); tor_free(*result); return NULL; + /* LCOV_EXCL_STOP */ case '\\': switch (cp[1]) { diff --git a/src/common/util_format.c b/src/common/util_format.c index 8aae9e8..2dea187 100644 --- a/src/common/util_format.c +++ b/src/common/util_format.c @@ -249,7 +249,7 @@ base64_encode(char *dest, size_t destlen, const char *src, size_t srclen, break; default: /* Something went catastrophically wrong. */ - tor_fragile_assert(); + tor_fragile_assert(); // LCOV_EXCL_LINE return -1; }

1 0

[tor/master] Reach 100% line coverage on memarea.c
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit f986e268505118265fa8fba14a7a5dc1331110c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 16 09:37:44 2016 -0400 Reach 100% line coverage on memarea.c --- src/test/test_util.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 52bc19a..abb400c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2845,19 +2845,40 @@ test_util_memarea(void *arg) p1 = memarea_alloc(area, 1); tt_ptr_op(p1,OP_EQ, p1_orig); memarea_clear(area); + size_t total = 0, initial_allocation, allocation2, dummy; + memarea_get_stats(area, &initial_allocation, &dummy); /* Check for running over an area's size. */ for (i = 0; i < 512; ++i) { - p1 = memarea_alloc(area, crypto_rand_int(5)+1); + size_t n = crypto_rand_int(6); + p1 = memarea_alloc(area, n); + total += n; tt_assert(memarea_owns_ptr(area, p1)); } memarea_assert_ok(area); + memarea_get_stats(area, &allocation2, &dummy); /* Make sure we can allocate a too-big object. */ p1 = memarea_alloc_zero(area, 9000); p2 = memarea_alloc_zero(area, 16); + total += 9000; + total += 16; tt_assert(memarea_owns_ptr(area, p1)); tt_assert(memarea_owns_ptr(area, p2)); + /* Now test stats... */ + size_t allocated = 0, used = 0; + memarea_get_stats(area, &allocated, &used); + tt_int_op(used, OP_LE, allocated); + tt_int_op(used, OP_GE, total); /* not EQ, because of alignment and headers*/ + tt_int_op(allocated, OP_GT, allocation2); + + tt_int_op(allocation2, OP_GT, initial_allocation); + + memarea_clear(area); + memarea_get_stats(area, &allocated, &used); + tt_int_op(used, OP_LT, 128); /* Not 0, because of header */ + tt_int_op(allocated, OP_EQ, initial_allocation); + done: memarea_drop_all(area); tor_free(malloced_ptr);

1 0

[snowflake/master] client multiplexes AND recovers correctly! (close #31)
by serene＠torproject.org 16 Jun '16

16 Jun '16

commit e93c38f83473476c8dddf9e107ce4df5bfea7882 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Jun 15 18:59:55 2016 -0700 client multiplexes AND recovers correctly! (close #31) - stabilize rest of WebRTCPeer - use uid for the datachannel label - store a consistent WebRTC config in the dialer --- .travis.yml | 1 + client/client_test.go | 8 ++++---- client/peers.go | 8 ++++---- client/rendezvous.go | 17 +++++++++-------- client/snowflake.go | 6 +++++- client/torrc | 2 +- client/util.go | 3 ++- client/webrtc.go | 40 ++++++++++++++++++++++++---------------- 8 files changed, 50 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f72040..2cc861b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ before_install: install: - go get -u github.com/smartystreets/goconvey - go get -u github.com/keroserene/go-webrtc + - go get -u github.com/dchest/uniuri - go get -u git.torproject.org/pluggable-transports/goptlib.git - pushd proxy - npm install diff --git a/client/client_test.go b/client/client_test.go index b5236a0..20614fa 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -49,7 +49,7 @@ type FakeDialer struct{} func (w FakeDialer) Catch() (Snowflake, error) { fmt.Println("Caught a dummy snowflake.") - return &webRTCConn{}, nil + return &WebRTCPeer{}, nil } type FakeSocksConn struct { @@ -63,9 +63,9 @@ func (f FakeSocksConn) Reject() error { } func (f FakeSocksConn) Grant(addr *net.TCPAddr) error { return nil } -type FakePeers struct{ toRelease *webRTCConn } +type FakePeers struct{ toRelease *WebRTCPeer } -func (f FakePeers) Collect() (Snowflake, error) { return &webRTCConn{}, nil } +func (f FakePeers) Collect() (Snowflake, error) { return &WebRTCPeer{}, nil } func (f FakePeers) Pop() Snowflake { return nil } func (f FakePeers) Melted() <-chan struct{} { return nil } @@ -141,7 +141,7 @@ func TestSnowflakeClient(t *testing.T) { cnt := 5 p := NewPeers(cnt) for i := 0; i < cnt; i++ { - p.activePeers.PushBack(&webRTCConn{}) + p.activePeers.PushBack(&WebRTCPeer{}) } So(p.Count(), ShouldEqual, cnt) p.End() diff --git a/client/peers.go b/client/peers.go index 098dd81..3187f09 100644 --- a/client/peers.go +++ b/client/peers.go @@ -70,7 +70,7 @@ func (p *Peers) Pop() Snowflake { var ok bool for nil == snowflake { snowflake, ok = <-p.snowflakeChan - conn := snowflake.(*webRTCConn) + conn := snowflake.(*WebRTCPeer) if !ok { return nil } @@ -79,7 +79,7 @@ func (p *Peers) Pop() Snowflake { } } // Set to use the same rate-limited traffic logger to keep consistency. - snowflake.(*webRTCConn).BytesLogger = p.BytesLogger + snowflake.(*WebRTCPeer).BytesLogger = p.BytesLogger return snowflake } @@ -99,7 +99,7 @@ func (p *Peers) Count() int { func (p *Peers) purgeClosedPeers() { for e := p.activePeers.Front(); e != nil; { next := e.Next() - conn := e.Value.(*webRTCConn) + conn := e.Value.(*WebRTCPeer) // Purge those marked for deletion. if conn.closed { p.activePeers.Remove(e) @@ -115,7 +115,7 @@ func (p *Peers) End() { cnt := p.Count() for e := p.activePeers.Front(); e != nil; { next := e.Next() - conn := e.Value.(*webRTCConn) + conn := e.Value.(*WebRTCPeer) conn.Close() p.activePeers.Remove(e) e = next diff --git a/client/rendezvous.go b/client/rendezvous.go index 2bcce17..6933df9 100644 --- a/client/rendezvous.go +++ b/client/rendezvous.go @@ -115,17 +115,19 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( // Implements the |Tongue| interface to catch snowflakes, using BrokerChannel. type WebRTCDialer struct { *BrokerChannel - // webrtcConfig *webrtc.Configuration - iceServers IceServerList + webrtcConfig *webrtc.Configuration } func NewWebRTCDialer( broker *BrokerChannel, iceServers IceServerList) *WebRTCDialer { - + config := webrtc.NewConfiguration(iceServers...) + if nil == config { + log.Println("Unable to prepare WebRTC configuration.") + return nil + } return &WebRTCDialer{ BrokerChannel: broker, - iceServers: iceServers, - // webrtcConfig: config, + webrtcConfig: config, } } @@ -136,8 +138,7 @@ func (w WebRTCDialer) Catch() (Snowflake, error) { } // TODO: [#3] Fetch ICE server information from Broker. // TODO: [#18] Consider TURN servers here too. - config := webrtc.NewConfiguration(w.iceServers...) - connection := NewWebRTCConnection(config, w.BrokerChannel) + connection := NewWebRTCConnection(w.webrtcConfig, w.BrokerChannel) err := connection.Connect() return connection, err } @@ -149,7 +150,7 @@ func (w WebRTCDialer) Catch() (Snowflake, error) { type CopyPasteDialer struct { webrtcConfig *webrtc.Configuration signal *os.File - current *webRTCConn + current *WebRTCPeer } func NewCopyPasteDialer(iceServers IceServerList) *CopyPasteDialer { diff --git a/client/snowflake.go b/client/snowflake.go index f172611..72c3295 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -75,7 +75,6 @@ func handler(socks SocksConnector, snowflakes SnowflakeCollector) error { handlerChan <- -1 }() // Obtain an available WebRTC remote. May block. - log.Println("handler: awaiting Snowflake...") snowflake := snowflakes.Pop() if nil == snowflake { socks.Reject() @@ -148,6 +147,10 @@ func main() { // Otherwise, use manual copy and pasting of SDP messages. snowflakes.Tongue = NewCopyPasteDialer(iceServers) } + if nil == snowflakes.Tongue { + log.Fatal("Unable to prepare rendezvous method.") + return + } // Use a real logger to periodically output how much traffic is happening. snowflakes.BytesLogger = &BytesSyncLogger{ inboundChan: make(chan int, 5), outboundChan: make(chan int, 5), @@ -212,4 +215,5 @@ func main() { case sig = <-sigChan: } } + log.Println("snowflake is done.") } diff --git a/client/torrc b/client/torrc index d066454..c294929 100644 --- a/client/torrc +++ b/client/torrc @@ -5,6 +5,6 @@ ClientTransportPlugin snowflake exec ./client \ -url https://snowflake-reg.appspot.com/ \ -front www.google.com \ -ice stun:stun.l.google.com:19302 \ --max 1 +-max 4 Bridge snowflake 0.0.3.0:1 diff --git a/client/util.go b/client/util.go index 73f0f50..74cd669 100644 --- a/client/util.go +++ b/client/util.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "github.com/keroserene/go-webrtc" "log" "strings" "time" + + "github.com/keroserene/go-webrtc" ) const ( diff --git a/client/webrtc.go b/client/webrtc.go index 4c7a3c8..62a59a0 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -3,16 +3,22 @@ package main import ( "bytes" "errors" - "github.com/keroserene/go-webrtc" "io" "log" "time" + + "github.com/dchest/uniuri" + "github.com/keroserene/go-webrtc" ) // Remote WebRTC peer. // Implements the |Snowflake| interface, which includes // |io.ReadWriter|, |Resetter|, and |Connector|. -type webRTCConn struct { +// +// Handles preparation of go-webrtc PeerConnection. Only ever has +// one DataChannel. +type WebRTCPeer struct { + id string config *webrtc.Configuration pc *webrtc.PeerConnection transport SnowflakeDataChannel // Holds the WebRTC DataChannel. @@ -33,13 +39,13 @@ type webRTCConn struct { // Read bytes from local SOCKS. // As part of |io.ReadWriter| -func (c *webRTCConn) Read(b []byte) (int, error) { +func (c *WebRTCPeer) Read(b []byte) (int, error) { return c.recvPipe.Read(b) } // Writes bytes out to remote WebRTC. // As part of |io.ReadWriter| -func (c *webRTCConn) Write(b []byte) (int, error) { +func (c *WebRTCPeer) Write(b []byte) (int, error) { c.BytesLogger.AddOutbound(len(b)) if nil == c.transport { log.Printf("Buffered %d bytes --> WebRTC", len(b)) @@ -51,7 +57,7 @@ func (c *webRTCConn) Write(b []byte) (int, error) { } // As part of |Snowflake| -func (c *webRTCConn) Close() error { +func (c *WebRTCPeer) Close() error { var err error = nil log.Printf("WebRTC: Closing") c.cleanup() @@ -61,7 +67,7 @@ func (c *webRTCConn) Close() error { } // As part of |Resetter| -func (c *webRTCConn) Reset() { +func (c *WebRTCPeer) Reset() { c.Close() go func() { c.reset <- struct{}{} @@ -70,12 +76,13 @@ func (c *webRTCConn) Reset() { } // As part of |Resetter| -func (c *webRTCConn) WaitForReset() { <-c.reset } +func (c *WebRTCPeer) WaitForReset() { <-c.reset } // Construct a WebRTC PeerConnection. func NewWebRTCConnection(config *webrtc.Configuration, - broker *BrokerChannel) *webRTCConn { - connection := new(webRTCConn) + broker *BrokerChannel) *WebRTCPeer { + connection := new(WebRTCPeer) + connection.id = "snowflake-" + uniuri.New() connection.config = config connection.broker = broker connection.offerChannel = make(chan *webrtc.SessionDescription, 1) @@ -94,7 +101,8 @@ func NewWebRTCConnection(config *webrtc.Configuration, } // As part of |Connector| interface. -func (c *webRTCConn) Connect() error { +func (c *WebRTCPeer) Connect() error { + log.Println(c.id, " connecting...") // TODO: When go-webrtc is more stable, it's possible that a new // PeerConnection won't need to be re-prepared each time. err := c.preparePeerConnection() @@ -113,7 +121,7 @@ func (c *webRTCConn) Connect() error { } // Create and prepare callbacks on a new WebRTC PeerConnection. -func (c *webRTCConn) preparePeerConnection() error { +func (c *WebRTCPeer) preparePeerConnection() error { if nil != c.pc { c.pc.Close() c.pc = nil @@ -161,11 +169,11 @@ func (c *webRTCConn) preparePeerConnection() error { } // Create a WebRTC DataChannel locally. -func (c *webRTCConn) establishDataChannel() error { +func (c *WebRTCPeer) establishDataChannel() error { if c.transport != nil { panic("Unexpected datachannel already exists!") } - dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) + dc, err := c.pc.CreateDataChannel(c.id, webrtc.Init{}) // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare // an SDP offer while other goroutines operating on this struct handle the // signaling. Eventually fires "OnOpen". @@ -220,7 +228,7 @@ func (c *webRTCConn) establishDataChannel() error { return nil } -func (c *webRTCConn) sendOfferToBroker() { +func (c *WebRTCPeer) sendOfferToBroker() { if nil == c.broker { return } @@ -235,7 +243,7 @@ func (c *webRTCConn) sendOfferToBroker() { // Block until an SDP offer is available, send it to either // the Broker or signal pipe, then await for the SDP answer. -func (c *webRTCConn) exchangeSDP() error { +func (c *WebRTCPeer) exchangeSDP() error { select { case offer := <-c.offerChannel: // Display for copy-paste when no broker available. @@ -272,7 +280,7 @@ func (c *webRTCConn) exchangeSDP() error { } // Close all channels and transports -func (c *webRTCConn) cleanup() { +func (c *WebRTCPeer) cleanup() { if nil != c.offerChannel { close(c.offerChannel) }

1 0

[tor/master] Bump to 0.2.8.4-rc-dev
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit e718a582af615989bbb586dac9f99690f8db420f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 12:55:17 2016 -0400 Bump to 0.2.8.4-rc-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9d4e56d..7471f99 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.4-rc]) +AC_INIT([tor],[0.2.8.4-rc-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 72523cd..7949c79 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.4-rc" +!define VERSION "0.2.8.4-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a6c8402..610ef2f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.4-rc" +#define VERSION "0.2.8.4-rc-dev"

1 0

[tor/master] forward-port changelog
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit 327d4c11ddbed709b3cca5bb12265f201797d569 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 12:56:40 2016 -0400 forward-port changelog --- ChangeLog | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6524b1a..9b10b3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,36 @@ Changes in version 0.2.9.1-alpha - 2016-??-?? +Changes in version 0.2.8.4-rc - 2016-06-15 + Tor 0.2.8.4-rc is the first release candidate in the Tor 0.2.8 series. + If we find no new bugs or regressions here, the first stable 0.2.8 + release will be identical to it. It has a few small bugfixes against + previous versions. + + o Major bugfixes (user interface): + - Correctly give a warning in the cases where a relay is specified + by nickname, and one such relay is found, but it is not officially + Named. Fixes bug 19203; bugfix on 0.2.3.1-alpha. + + o Minor features (build): + - Tor now builds once again with the recent OpenSSL 1.1 development + branch (tested against 1.1.0-pre5 and 1.1.0-pre6-dev). + + o Minor features (geoip): + - Update geoip and geoip6 to the June 7 2016 Maxmind GeoLite2 + Country database. + + o Minor bugfixes (compilation): + - Cause the unit tests to compile correctly on mingw64 versions that + lack sscanf. Fixes bug 19213; bugfix on 0.2.7.1-alpha. + + o Minor bugfixes (downloading): + - Predict more correctly whether we'll be downloading over HTTP when + we determine the maximum length of a URL. This should avoid a + "BUG" warning about the Squid HTTP proxy and its URL limits. Fixes + bug 19191. + + Changes in version 0.2.8.3-alpha - 2016-05-26 Tor 0.2.8.3-alpha resolves several bugs, most of them introduced over the course of the 0.2.8 development cycle. It improves the behavior of

1 0

[tor/master] ondrej is no longer making rpms
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit 2042080b2108474c38b458a6e74cbe1bc185ea9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 12:55:40 2016 -0400 ondrej is no longer making rpms --- doc/HACKING/ReleasingTor.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 5cfd238..8f5a47d 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -147,7 +147,6 @@ Here are the steps Roger takes when putting out a new Tor release: - {weasel,gk,mikeperry} at torproject dot org - {blueness} at gentoo dot org - {paul} at invizbox dot io - - {ondrej.mikle} at gmail dot com - {lfleischer} at archlinux dot org - {tails-dev} at boum dot org

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit 4bcec3bab5b0f93934bfe67093146c7a77fa724f Merge: 2042080 e718a58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 12:55:54 2016 -0400 Merge branch 'maint-0.2.8' 'ours' merge to avoid bumping version.

1 0

[tor/maint-0.2.8] Bump to 0.2.8.4-rc-dev
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit e718a582af615989bbb586dac9f99690f8db420f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 12:55:17 2016 -0400 Bump to 0.2.8.4-rc-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9d4e56d..7471f99 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.4-rc]) +AC_INIT([tor],[0.2.8.4-rc-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 72523cd..7949c79 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.4-rc" +!define VERSION "0.2.8.4-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a6c8402..610ef2f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.4-rc" +#define VERSION "0.2.8.4-rc-dev"

1 0

[tor/release-0.2.8] Bump to 0.2.8.4-rc-dev
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit e718a582af615989bbb586dac9f99690f8db420f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 12:55:17 2016 -0400 Bump to 0.2.8.4-rc-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9d4e56d..7471f99 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.4-rc]) +AC_INIT([tor],[0.2.8.4-rc-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 72523cd..7949c79 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.4-rc" +!define VERSION "0.2.8.4-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a6c8402..610ef2f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.4-rc" +#define VERSION "0.2.8.4-rc-dev"

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit 61d795f856ea539d38d36cf7e414b070d9551078 Merge: fa6a228 e718a58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 12:55:26 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0