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

[tor/release-0.2.8] Remove "bugfix on 0.2.8.x" from 0.2.8 release notes
by nickm＠torproject.org 16 Jun '16

16 Jun '16

commit b673f7e1741b9b8d5913ea124a8b23a5a6322c45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 16:45:44 2016 -0400 Remove "bugfix on 0.2.8.x" from 0.2.8 release notes --- ReleaseNotes | 91 ------------------------------------------------------------ 1 file changed, 91 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index 729f7f9..b117620 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -46,12 +46,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? ports have been configured. You can change this behavior with the new option KeepBindCapabilities. Closes ticket 8195. - o Major bugfixes (bridges, pluggable transports): - - Modify the check for OR connections to private addresses. Allow - bridges on private addresses, including pluggable transports that - ignore the (potentially private) address in the bridge line. Fixes - bug 18517; bugfix on 0.2.8.1-alpha. Reported by gk, patch by teor. - o Major bugfixes (client, bootstrapping): - Check if bootstrap consensus downloads are still needed when the linked connection attaches. This prevents tor making unnecessary @@ -63,46 +57,16 @@ Changes in version 0.2.8.??? - 2015-0?-?? - Make relays retry consensus downloads the correct number of times, rather than the more aggressive client retry count. Fixes part of ticket 18809. - - Stop downloading consensuses when we have a consensus, even if we - don't have all the certificates for it yet. Fixes bug 18809; - bugfix on 0.2.8.1-alpha. Patches by arma and teor. o Major bugfixes (compilation): - Repair hardened builds under the clang compiler. Previously, our use of _FORTIFY_SOURCE would conflict with clang's address sanitizer. Fixes bug 14821; bugfix on 0.2.5.4-alpha. - o Major bugfixes (crash on shutdown): - - Correctly handle detaching circuits from muxes when shutting down. - Fixes bug 18116; bugfix on 0.2.8.1-alpha. - - Fix an assert-on-exit bug related to counting memory usage in - rephist.c. Fixes bug 18651; bugfix on 0.2.8.1-alpha. - - o Major bugfixes (crash on startup): - - Fix a segfault during startup: If a Unix domain socket was - configured as listener (such as a ControlSocket or a SocksPort - "unix:" socket), and tor was started as root but not configured to - switch to another user, tor would segfault while trying to string - compare a NULL value. Fixes bug 18261; bugfix on 0.2.8.1-alpha. - Patch by weasel. - - o Major bugfixes (directory mirrors): - - Decide whether to advertise begindir support in the the same way - we decide whether to advertise our DirPort. Allowing these - decisions to become out-of-sync led to surprising behavior like - advertising begindir support when hibernation made us not - advertise a DirPort. Resolves bug 18616; bugfix on 0.2.8.1-alpha. - Patch by teor. - o Major bugfixes (dns proxy mode, crash): - Avoid crashing when running as a DNS proxy. Fixes bug 16248; bugfix on 0.2.0.1-alpha. Patch from "cypherpunks". - o Major bugfixes (IPv6 bridges, client): - - Actually use IPv6 addresses when selecting directory addresses for - IPv6 bridges. Fixes bug 18921; bugfix on 0.2.8.1-alpha. Patch - by "teor". - o Major bugfixes (key management): - If OpenSSL fails to generate an RSA key, do not retain a dangling pointer to the previous (uninitialized) key value. The impact here @@ -112,12 +76,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? 0.2.1.10-alpha. Found by Yuan Jochen Kang, Suman Jana, and Baishakhi Ray. - o Major bugfixes (relays, bridge clients): - - Ensure relays always allow IPv4 OR and Dir connections. Ensure - bridge clients use the address configured in the bridge line. - Fixes bug 18348; bugfix on 0.2.8.1-alpha. Reported by sysrqb, - patch by teor. - o Major bugfixes (security, client, DNS proxy): - Stop a crash that could occur when a client running with DNSPort received a query with multiple address types, and the first @@ -131,11 +89,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? needlessly disabling compiler-hardening support. Fixes one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from "trudokal". - o Major bugfixes (security, directory authorities): - - Fix a crash and out-of-bounds write during authority voting, when - the list of relays includes duplicate ed25519 identity keys. Fixes - bug 19032; bugfix on 0.2.8.2-alpha. - o Major bugfixes (security, pointers): - Avoid a difficult-to-trigger heap corruption attack when extending a smartlist to contain over 16GB of pointers. Fixes bug 18162; @@ -143,8 +96,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? Reported by Guido Vranken. o Major bugfixes (testing): - - Avoid "WSANOTINITIALISED" warnings in the unit tests. Fixes bug 18668; - bugfix on 0.2.8.1-alpha. - Fix a bug that would block 'make test-network-all' on systems where IPv6 packets were lost. Fixes bug 19008; bugfix on tor-0.2.7.3-rc. @@ -245,14 +196,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? for directory caches chosen from the consensus.) Closes ticket 17864; patch by "teor". - o Minor features (fallback directory mirrors): - - Give each fallback the same weight for client selection; restrict - fallbacks to one per operator; report fallback directory detail - changes when rebuilding list; add new fallback directory mirrors - to the whitelist; update fallback directories based on the latest - OnionOO data; and any other minor simplifications and fixes. - Closes tasks 17158, 17905, 18749, bug 18689, and fixes part of bug - 18812 on 0.2.8.1-alpha; patch by "teor". o Minor features (geoip): - Update geoip and geoip6 to the January 5 2016 Maxmind GeoLite2 @@ -424,9 +367,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? - Do not link the unit tests against both the testing and non- testing versions of the static libraries. Fixes bug 18490; bugfix on 0.2.7.1-alpha. - - Remove a pair of redundant AM_CONDITIONAL declarations from - configure.ac. Fixes one final case of bug 17744; bugfix - on 0.2.8.2-alpha. - Resolve warnings when building on systems that are concerned with signed char. Fixes bug 18728; bugfix on 0.2.7.2-alpha and 0.2.6.1-alpha. @@ -437,15 +377,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? treat libscrypt as absent. Fixes bug 19161; bugfix on 0.2.6.1-alpha. - o Minor bugfixes (client): - - Make directory node selection more reliable, mainly for IPv6-only - clients and clients with few reachable addresses. Fixes bug 18929; - bugfix on 0.2.8.1-alpha. Patch by "teor". - - Turn all TestingClientBootstrap* into non-testing torrc options. - This changes simply renames them by removing "Testing" in front of - them and they do not require TestingTorNetwork to be enabled - anymore. Fixes bug 18481; bugfix on 0.2.8.1-alpha. - o Minor bugfixes (client, bootstrap): - Count receipt of new microdescriptors as progress towards bootstrapping. Previously, with EntryNodes set, Tor might not @@ -516,9 +447,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? 17658; bugfix on 0.2.3.6-alpha. Patch by "teor". o Minor bugfixes (crypto, portability): - - The SHA3 and SHAKE routines now produce the correct output on Big - Endian systems. No code calls either algorithm yet, so this is - primarily a build fix. Fixes bug 18943; bugfix on 0.2.8.1-alpha. - Tor now builds again with the recent OpenSSL 1.1 development branch (tested against 1.1.0-pre4 and 1.1.0-pre5-dev). Closes ticket 18286. @@ -591,14 +519,8 @@ Changes in version 0.2.8.??? - 2015-0?-?? start up faster. Fixes bug 18548; bugfix on 0.2.5.1-alpha. - Fix a crash when using offline master ed25519 keys with the Linux seccomp2 sandbox enabled. Fixes bug 17675; bugfix on 0.2.7.3-rc. - - Fix the sandbox's interoperability with unix domain sockets under - setuid. Fixes bug 18253; bugfix on 0.2.8.1-alpha. o Minor bugfixes (logging): - - Downgrade logs and backtraces about IP versions to info-level. - Only log backtraces once each time tor runs. Assists in diagnosing - bug 18351; bugfix on 0.2.8.1-alpha. Reported by sysrqb and - Christian, patch by teor. - In log messages that include a function name, use __FUNCTION__ instead of __PRETTY_FUNCTION__. In GCC, these are synonymous, but with clang __PRETTY_FUNCTION__ has extra information we don't @@ -608,13 +530,9 @@ Changes in version 0.2.8.??? - 2015-0?-?? addresses. Fixes bug 17843; bugfix on 0.2.3.3-alpha. - Scrub service name in "unrecognized service ID" log messages. Fixes bug 18600; bugfix on 0.2.4.11-alpha. - - Stop periodic_event_dispatch() from blasting twelve lines per - second at loglevel debug. Fixes bug 18729; fix on 0.2.8.1-alpha. - When logging information about an unparsable networkstatus vote or consensus, do not say "vote" when we mean consensus. Fixes bug 18368; bugfix on 0.2.0.8-alpha. - - When rejecting a misformed INTRODUCE2 cell, only log at - PROTOCOL_WARN severity. Fixes bug 18761; bugfix on 0.2.8.2-alpha. - When we can't generate a signing key because OfflineMasterKey is set, do not imply that we should have been able to load it. Fixes bug 18133; bugfix on 0.2.7.2-alpha. @@ -624,9 +542,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? in get_interface_addresses_ioctl(). Fixes bug 18454; bugfix on 0.2.3.11-alpha. Reported by toralf and "cypherpunks", patch by teor. - - Correctly duplicate addresses in get_interface_address6_list(). - Fixes bug 18454; bugfix on 0.2.8.1-alpha. Reported by toralf, - patch by "cypherpunks". - Fix a memory leak in "tor --list-fingerprint". Fixes part of bug 18672; bugfix on 0.2.5.1-alpha. - Fix a memory leak in tor-gencert. Fixes part of bug 18672; bugfix @@ -661,9 +576,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? descriptor with DirPort 0 when the DirPort reachability test takes longer than the ORPort reachability test. Fixes bug 18050; bugfix on 0.1.0.1-rc. Reported by "starlight", patch by "teor". - - Consider more config options when relays decide whether to - regenerate their descriptor. Fixes more of bug 12538; bugfix - on 0.2.8.1-alpha. - Resolve some edge cases where we might launch an ORPort reachability check even when DisableNetwork is set. Noticed while fixing bug 18616; bugfix on 0.2.3.9-alpha. @@ -704,9 +616,6 @@ Changes in version 0.2.8.??? - 2015-0?-?? by karsten. o Minor bugfixes (testing): - - Allow directories in small networks to bootstrap by skipping - DirPort checks when the consensus has no exits. Fixes bug 19003; - bugfix on 0.2.8.1-alpha. Patch by teor. - Check the full results of SHA256 and SHA512 digests in the unit tests. Bugfix on 0.2.2.4-alpha. Patch by "teor". - Fix a memory leak in the ntor test. Fixes bug 17778; bugfix

1 0

[webwml/master] Tor 0.2.8.4-rc source release is out
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit 31e94ac7e1e9182dbd23b98b74d3252856743691 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 15 12:48:24 2016 -0400 Tor 0.2.8.4-rc source release is out --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 69e74da..9e24d60 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.2.7.6 -export DEVTAG=tor-0.2.8.3-alpha +export DEVTAG=tor-0.2.8.4-rc WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index f58aae2..f4b1c05 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.7.6</define-tag> -<define-tag version-alpha whitespace=delete>0.2.8.3-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.8.4-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag>

1 0

[tor/master] Perform cache lookup when FetchHidServDescriptors is set
by nickm＠torproject.org 15 Jun '16

15 Jun '16

commit c7f1b46a104b18bed017d509a8860e60f7154d67 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 15 09:54:59 2016 -0400 Perform cache lookup when FetchHidServDescriptors is set The FetchHidServDescriptors check was placed before the descriptor cache lookup which made the option not working because it was never using the cache in the first place. Fixes #18704 Patched-by: twim Signef-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug18704 | 5 +++++ src/or/rendclient.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/bug18704 b/changes/bug18704 new file mode 100644 index 0000000..966cc2a --- /dev/null +++ b/changes/bug18704 @@ -0,0 +1,5 @@ + o Major bugfixes (hidden service client) + - With FetchHidServDescriptors set to 0, there is no descriptor fetch + (which is intended) but also no descriptor cache lookup was done + making any Tor client not working with this option unset. Resolves + ticket #18704. Patch by "twim"; Bugfix on tor-0.2.0.20-rc. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 7e92dce..64d3673 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -895,12 +895,6 @@ rend_client_refetch_v2_renddesc(rend_data_t *rend_query) rend_cache_entry_t *e = NULL; tor_assert(rend_query); - /* Are we configured to fetch descriptors? */ - if (!get_options()->FetchHidServDescriptors) { - log_warn(LD_REND, "We received an onion address for a v2 rendezvous " - "service descriptor, but are not fetching service descriptors."); - return; - } /* Before fetching, check if we already have a usable descriptor here. */ if (rend_cache_lookup_entry(rend_query->onion_address, -1, &e) == 0 && rend_client_any_intro_points_usable(e)) { @@ -908,6 +902,12 @@ rend_client_refetch_v2_renddesc(rend_data_t *rend_query) "already have a usable descriptor here. Not fetching."); return; } + /* Are we configured to fetch descriptors? */ + if (!get_options()->FetchHidServDescriptors) { + log_warn(LD_REND, "We received an onion address for a v2 rendezvous " + "service descriptor, but are not fetching service descriptors."); + return; + } log_debug(LD_REND, "Fetching v2 rendezvous descriptor for service %s", safe_str_client(rend_query->onion_address));

1 0

[torbirdy/master] Update log comments
by sukhbir＠torproject.org 15 Jun '16

15 Jun '16

commit c0337354dd972fecef30f651ab987cc6c375e39d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 15 08:40:19 2016 -0400 Update log comments --- components/torbirdy.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 1f569d0..84ea9c7 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -459,7 +459,7 @@ TorBirdy.prototype = { onUninstalling: function(addon, needsRestart) { this.onStateChange(); if (addon.id == TB_ID) { - dump("Nooo! TorBirdy uninstall requested\n"); + dump("TorBirdy uninstall requested\n"); this._uninstall = true; this.resetUserPrefs(); } @@ -468,7 +468,7 @@ TorBirdy.prototype = { onOperationCancelled: function(addon) { this.onStateChange(); if (addon.id == TB_ID) { - dump("Uninstall requested cancelled. Yayay!\n"); + dump("Uninstall requested cancelled\n"); this._uninstall = false; this.setPrefs(); }

1 0

[torbirdy/master] Update changelog and set version to 0.2.0
by sukhbir＠torproject.org 15 Jun '16

15 Jun '16

commit 1319ae8e33b4c6ee5ff61e9bb9f87ece14f2636d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 15 09:49:06 2016 -0400 Update changelog and set version to 0.2.0 --- ChangeLog | 25 +++++++++++++++++++++++-- install.rdf | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5b4021..6dfb72f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +0.2.0, + + * Bug 6314: Prevent local timestamp disclosure via Date header + * Bug 6315: Prevent local timestamp disclosure via Message-ID header + * Bug 13721: Fix usage of wrong locale + * Bug 17426: Allow configuration of default email protocol + * Bug 15459: Add support for deterministic XPI generation + * Bug 11387, 13006: Fix non-standard EHLO argument + * Bug 17118: Allow manual account configuration for Gmail with OAuth2 + * Bug 19031: Add and audit support for RSS reader + * Bug 7847: Audit and update support for NNTP + * Bug 10683: Update Thunderbird UI to reflect TorBirdy's state + * Bug 19330: Set secure defaults for outgoing mail servers + * Removed compatibility for older versions of Thunderbird and added support + for Thunderbird 37+. + * Added support for automatic configuration of Riseup email accounts. + * Updated various privacy and security settings (see commit 2bdeffbb for a + list of the changes) + * Update translations for existing languages + * Many thanks to Arthur Edelstein and the Tails Developers for this release + 0.1.4, 09 March 2015 * Fix bug that prevented Thunderbird with TorBirdy 0.1.3 from starting in profiles with more than three IMAP accounts (closes #14099, #13982, @@ -35,10 +56,10 @@ * Korean * Latvian * Norwegian Bokmål - * Norwegian Nynorsk + * Norwegian Nynorsk * Punjabi * Polish - * Portuguese + * Portuguese * Portuguese (Brazil) * Romanian * Russian diff --git a/install.rdf b/install.rdf index ffe53cd..801c7ad 100644 --- a/install.rdf +++ b/install.rdf @@ -4,7 +4,7 @@ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> <Description about="urn:mozilla:install-manifest"> <em:id>castironthunderbirdclub(a)torproject.org</em:id> - <em:version>0.1.4</em:version> + <em:version>0.2.0</em:version> <em:type>2</em:type> <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL>

1 0

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

15 Jun '16

commit 3a0d42fbf97384526fb51de9a58e9b49bbccf2e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 20:36:35 2016 -0400 bump version to 0.2.8.4-rc --- 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 4976d7b..9d4e56d 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.3-alpha-dev]) +AC_INIT([tor],[0.2.8.4-rc]) 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 f1b9bbd..72523cd 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.3-alpha-dev" +!define VERSION "0.2.8.4-rc" !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 4e9c3ff..a6c8402 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.3-alpha-dev" +#define VERSION "0.2.8.4-rc"

1 0

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

15 Jun '16

commit 3a0d42fbf97384526fb51de9a58e9b49bbccf2e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 20:36:35 2016 -0400 bump version to 0.2.8.4-rc --- 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 4976d7b..9d4e56d 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.3-alpha-dev]) +AC_INIT([tor],[0.2.8.4-rc]) 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 f1b9bbd..72523cd 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.3-alpha-dev" +!define VERSION "0.2.8.4-rc" !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 4e9c3ff..a6c8402 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.3-alpha-dev" +#define VERSION "0.2.8.4-rc"

1 0

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

15 Jun '16

commit 3a0d42fbf97384526fb51de9a58e9b49bbccf2e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 20:36:35 2016 -0400 bump version to 0.2.8.4-rc --- 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 4976d7b..9d4e56d 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.3-alpha-dev]) +AC_INIT([tor],[0.2.8.4-rc]) 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 f1b9bbd..72523cd 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.3-alpha-dev" +!define VERSION "0.2.8.4-rc" !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 4e9c3ff..a6c8402 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.3-alpha-dev" +#define VERSION "0.2.8.4-rc"

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 fa6a228ce86c2737447f32c78eedc00083eb826c Merge: 1cdb839 3a0d42f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 20:36:40 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

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

15 Jun '16

commit 657067ef9d89c5dd62036e3df78b4bdf62130f42 Merge: 05e2750 3a0d42f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 20:36:54 2016 -0400 Merge branch 'maint-0.2.8' This is an "ours" merge to avoid taking a version bump.

1 0